Changeset 9579 for src

Timestamp:

Aug 26, 2011, 8:54:24 PM (13 years ago)

Author:

rick

Message:

Map a SSID to an organization to play nice with differnt SSIDs.

Location:

src/django_gheat

Files:

• gheat/admin.py (modified) (1 diff)
• gheat/management/commands/import_droidstumbler.py (modified) (1 diff)
• gheat/management/commands/import_kismet.py (modified) (1 diff)
• gheat/models.py (modified) (2 diffs)
• wlheatmap/filters.py (modified) (1 diff)
• wlheatmap/nodelist.py (modified) (1 diff)
• wlheatmap/templates/js/LayerBase.js (modified) (3 diffs)

src/django_gheat/gheat/admin.py

@@ -2 +2 @@
 from django.contrib import admin
 
-admin.site.register(Accespoint)
+class AccespointAdmin(admin.ModelAdmin):
+  list_display = ['ssid','mac', 'organization']
+  search_fields = ['ssid', 'mac', 'organization']
+
+admin.site.register(Accespoint, AccespointAdmin)
 admin.site.register(Apparatuur)
 admin.site.register(Gebruiker)

src/django_gheat/gheat/management/commands/import_droidstumbler.py

@@ -96 +96 @@
       ssid, encryption = ap_pool[bssid]
       # Special trick in SSID ts avoid escaping in later stage
-      item = str((bssid.upper(),ssid.replace('%','%%'),encryption))
+      item = str((bssid.upper(),ssid.replace('%','%%'),encryption,Accespoint.get_organization(ssid)))
       sql_values.append(item)
-    counters['ap_added'] = bulk_sql('gheat_accespoint (`mac`, `ssid`, `encryptie`)',sql_values)
+    counters['ap_added'] = bulk_sql('gheat_accespoint (`mac`, `ssid`, `encryptie`, `organization`)',sql_values)
 
   # Build mapping for meting import

src/django_gheat/gheat/management/commands/import_kismet.py

@@ -76 +76 @@
       ssid, encryption = ap_pool[bssid]
       # Special trick in SSID ts avoid escaping in later stage
-      item = str((bssid.upper(),ssid.replace('%','%%'),encryption))
+      item = str((bssid.upper(),ssid.replace('%','%%'),encryption,Accespoint.get_organization(ssid)))
       sql_values.append(item)
-    counters['ap_added'] = bulk_sql('gheat_accespoint (`mac`, `ssid`, `encryptie`)',sql_values)
+    counters['ap_added'] = bulk_sql('gheat_accespoint (`mac`, `ssid`, `encryptie`, `organization`)',sql_values)
 
   # Determine which Wireless Clients to add

src/django_gheat/gheat/models.py

@@ -57 +57 @@
     return self.mac
 
+
+ORGANIZATION_CHOICES = (
+  ('WirelessLeiden', 'Wireless Leiden'),
+)
+
 class Accespoint(models.Model):
   mac = models.CharField(max_length=17)
   ssid = models.CharField(max_length=64)
+  organization = models.CharField(max_length="50",choices=ORGANIZATION_CHOICES,null=True,blank=True)
   encryptie = models.BooleanField()
   class Meta:
@@ -65 +71 @@
   def __unicode__(self):
     return "%s - %s" % (self.mac, self.ssid)
+
+  @staticmethod
+  def get_organization(ssid):
+    """ Try to determine the organization via the SSID """
+    organization = ''
+    if ssid.startswith('ap') and ssid.endswith('wleiden.net'):
+      organization = 'WirelessLeiden'
+    elif ssid.startswith('ap') and 'WirelessLeiden' in ssid:
+      organization = 'WirelessLeiden'
+    return organization
+
+  def save(self, *args, **kwargs):
+    self.organization = self.get_organization(self.ssid)
+    super(Accespoint, self).save(*args, **kwargs)
 
 class Gebruiker(models.Model):

src/django_gheat/wlheatmap/filters.py

@@ -20 +20 @@
       # Get list if accespoints found in the specific 'Meting', and make this is list.
       wirelessleiden_ssid = Meting.objects.filter(meetrondje=mr,
-        accespoint__ssid__contains='WirelessLeiden').\
+        accespoint__organization='WirelessLeiden').\
         values_list('accespoint__ssid',flat=True).\
         order_by('accespoint__ssid').distinct()

src/django_gheat/wlheatmap/nodelist.py

@@ -40 +40 @@
   filter = {}
   filter.update({
-    'ssid__contains' : 'WirelessLeiden',
+    'organization' : 'WirelessLeiden',
     'meting__latitude__lt' : maxlat,
     'meting__longitude__lt' : maxlon,

src/django_gheat/wlheatmap/templates/js/LayerBase.js

@@ -168 +168 @@
 OpenLayers.Layer.OSM.Overlay2 = OpenLayers.Class(OpenLayers.Layer.OSM, {
     initialize: function(name, options) {
-        var url = get_balanced_urls('http://', {{ settings.DJANGO_CDN_DOMAINS|safe }}, '{{ settings.DJANGO_PREFIX }}/wlheatmap/tile/${z}/${x},${y}.png?colour=90,90,90');
+        var url = get_balanced_urls('http://', {{ settings.DJANGO_CDN_DOMAINS|safe }},
+          '{{ settings.DJANGO_PREFIX }}/wlheatmap/tile/${z}/${x},${y}.png?colour=90,90,90');
         options = OpenLayers.Util.extend({ numZoomLevels: 21 }, options);
         var newArguments = [name, url, options];
@@ -182 +183 @@
 OpenLayers.Layer.OSM.Overlay3 = OpenLayers.Class(OpenLayers.Layer.OSM, {
     initialize: function(name, options) {
-        var url = get_balanced_urls('http://', {{ settings.DJANGO_CDN_DOMAINS|safe }}, '{{ settings.DJANGO_PREFIX }}/wlheatmap/tile/${z}/${x},${y}.png?colour=255,0,0&accespoint__ssid__icontains=WirelessLeiden');
+        var url = get_balanced_urls('http://', {{ settings.DJANGO_CDN_DOMAINS|safe }},
+          '{{ settings.DJANGO_PREFIX }}/wlheatmap/tile/${z}/${x},${y}.png?colour=255,0,0&accespoint__organization=WirelessLeiden');
         options = OpenLayers.Util.extend({ numZoomLevels: 21 }, options);
         var newArguments = [name, url, options];
@@ -196 +198 @@
 OpenLayers.Layer.OSM.Overlay4 = OpenLayers.Class(OpenLayers.Layer.OSM, {
   initialize: function(name, options) {
-    var url = get_balanced_urls('http://', {{ settings.DJANGO_CDN_DOMAINS|safe }}, '{{ settings.DJANGO_PREFIX }}/wlheatmap/tile/${z}/${x},${y}.png?colour=50,150,50&signaal__gte=0&signaal__lte=100');
+    var url = get_balanced_urls('http://', {{ settings.DJANGO_CDN_DOMAINS|safe }},
+      '{{ settings.DJANGO_PREFIX }}/wlheatmap/tile/${z}/${x},${y}.png?colour=50,150,50&signaal__gte=0&signaal__lte=100');
     options = OpenLayers.Util.extend({ numZoomLevels: 21 }, options);
     var newArguments = [name, url, options];