0x2620/pandora
2
1
Fork 1
Code Issues 1.3k Pull requests Releases Wiki Activity

useragents can be longer

Browse source
This commit is contained in:
j 2014-03-03 19:54:57 +00:00
parent 93cd998fcf
commit 160dbacbb0
2 changed files with 94 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

92
pandora/user/migrations/0003_useragent.py Normal file
View file

@ -0,0 +1,92 @@
# -*- coding: utf-8 -*-
import datetime
from south.db import db
from south.v2 import SchemaMigration
from django.db import models
class Migration(SchemaMigration):
def forwards(self, orm):
# Changing field 'SessionData.useragent'
db.alter_column('user_sessiondata', 'useragent', self.gf('django.db.models.fields.CharField')(max_length=4096, null=True))
def backwards(self, orm):
# Changing field 'SessionData.useragent'
db.alter_column('user_sessiondata', 'useragent', self.gf('django.db.models.fields.CharField')(max_length=255, null=True))
models = {
'auth.group': {
'Meta': {'object_name': 'Group'},
'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255'}),
'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'})
},
'auth.permission': {
'Meta': {'ordering': "('content_type__app_label', 'content_type__model', 'codename')", 'unique_together': "(('content_type', 'codename'),)", 'object_name': 'Permission'},
'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}),
'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
},
'auth.user': {
'Meta': {'object_name': 'User'},
'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
'email': ('django.db.models.fields.EmailField', [], {'max_length': '255', 'blank': 'True'}),
'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}),
'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
'password': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}),
'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255'})
},
'contenttypes.contenttype': {
'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"},
'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
},
'user.sessiondata': {
'Meta': {'object_name': 'SessionData'},
'browser': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True'}),
'firstseen': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'db_index': 'True', 'blank': 'True'}),
'groupssort': ('django.db.models.fields.CharField', [], {'default': 'None', 'max_length': '255', 'null': 'True', 'blank': 'True'}),
'info': ('ox.django.fields.DictField', [], {'default': '{}'}),
'ip': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True'}),
'lastseen': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now', 'db_index': 'True'}),
'level': ('django.db.models.fields.IntegerField', [], {'default': '0', 'db_index': 'True'}),
'location': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True'}),
'location_sort': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True'}),
'numberoflists': ('django.db.models.fields.IntegerField', [], {'default': '0', 'null': 'True'}),
'screensize': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True'}),
'session_key': ('django.db.models.fields.CharField', [], {'max_length': '40', 'primary_key': 'True'}),
'system': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True'}),
'timesseen': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
'user': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'data'", 'unique': 'True', 'null': 'True', 'to': "orm['auth.User']"}),
'useragent': ('django.db.models.fields.CharField', [], {'max_length': '4096', 'null': 'True'}),
'username': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'db_index': 'True'}),
'windowsize': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True'})
},
'user.userprofile': {
'Meta': {'object_name': 'UserProfile'},
'files_updated': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
'level': ('django.db.models.fields.IntegerField', [], {'default': '1'}),
'newsletter': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
'notes': ('django.db.models.fields.TextField', [], {'default': "''"}),
'preferences': ('ox.django.fields.DictField', [], {'default': '{}'}),
'reset_code': ('django.db.models.fields.CharField', [], {'max_length': '255', 'unique': 'True', 'null': 'True', 'blank': 'True'}),
'ui': ('ox.django.fields.DictField', [], {'default': '{}'}),
'user': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'profile'", 'unique': 'True', 'to': "orm['auth.User']"})
}
}
complete_apps = ['user']

4
pandora/user/models.py
View file

@ -30,7 +30,7 @@ class SessionData(models.Model):
timesseen = models.IntegerField(default=0)
ip = models.CharField(max_length=255, null=True)
useragent = models.CharField(max_length=255, null=True)
useragent = models.CharField(max_length=4096, null=True)
windowsize = models.CharField(max_length=255, null=True)
screensize = models.CharField(max_length=255, null=True)
info = DictField(default={})
@ -115,7 +115,7 @@ class SessionData(models.Model):
data.ip = request.META['REMOTE_ADDR']
if data.ip.startswith('::ffff:'):
data.ip = data.ip[len('::ffff:'):]
data.useragent = request.META['HTTP_USER_AGENT']
data.useragent = request.META['HTTP_USER_AGENT'][:4096]
data.info = json.loads(request.POST.get('data', '{}'))
screen = data.info.get('screen', {})
if screen and 'height' in screen and 'width' in screen: