flo/nsupdate.info
1
0
Fork 0
Code Issues 1 Pull Requests 2 Packages Releases Activity

removed proxy user, because solution was not working. Made id session based. please work now :'(

Browse Source
This commit is contained in:
Fabian Faessler 2013-09-29 14:33:24 +02:00
parent 09da9a4036
commit f25ed3cdee
7 changed files with 129 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
nsupdate/api/views.py
View File

@ -7,8 +7,9 @@ from django.http import HttpResponse
from django.conf import settings
from django.contrib.auth.hashers import check_password
from django.contrib.auth.decorators import login_required
from django.contrib.sessions.backends.db import SessionStore
from main.models import Host, ProxyUser
from main.models import Host
import dns.inet
import os
@ -21,16 +22,15 @@ def MyIpView(request):
def DetectIpView(request, secret=None):
user = ProxyUser.objects.get(secret=secret)
print user
try:
s = SessionStore(session_key=secret)
except SessionStore.DoesNotExist:
s = request.session
ipaddr = request.META['REMOTE_ADDR']
af = dns.inet.af_for_address(ipaddr)
if af == dns.inet.AF_INET:
request.user.ipv4 = ipaddr
else:
request.user.ipv6 = ipaddr
request.user.ipv4 = ipaddr
key = 'ipv4' if af == dns.inet.AF_INET else 'ipv6'
s[key] = ipaddr
with open(os.path.join(settings.STATIC_ROOT, "1px.gif"), "rb") as f:
image_data = f.read()

113
nsupdate/main/migrations/0006_remove_proxy_user.py Normal file
View File

@ -0,0 +1,113 @@
# -*- 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):
# Deleting model 'ProxyUser'
db.delete_table(u'main_proxyuser')
# Removing M2M table for field groups on 'ProxyUser'
db.delete_table('main_proxyuser_groups')
# Removing M2M table for field user_permissions on 'ProxyUser'
db.delete_table('main_proxyuser_user_permissions')
# Changing field 'Host.created_by'
db.alter_column(u'main_host', 'created_by_id', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['auth.User']))
def backwards(self, orm):
# Adding model 'ProxyUser'
db.create_table(u'main_proxyuser', (
('username', self.gf('django.db.models.fields.CharField')(max_length=30, unique=True)),
('first_name', self.gf('django.db.models.fields.CharField')(max_length=30, blank=True)),
('last_name', self.gf('django.db.models.fields.CharField')(max_length=30, blank=True)),
('is_staff', self.gf('django.db.models.fields.BooleanField')(default=False)),
('is_active', self.gf('django.db.models.fields.BooleanField')(default=True)),
(u'id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
('is_superuser', self.gf('django.db.models.fields.BooleanField')(default=False)),
('secret', self.gf('django.db.models.fields.CharField')(default='', max_length=256, null=True, blank=True)),
('last_login', self.gf('django.db.models.fields.DateTimeField')(default=datetime.datetime.now)),
('ipv4', self.gf('django.db.models.fields.GenericIPAddressField')(max_length=39, null=True, blank=True)),
('ipv6', self.gf('django.db.models.fields.GenericIPAddressField')(max_length=39, null=True, blank=True)),
('password', self.gf('django.db.models.fields.CharField')(max_length=128)),
('email', self.gf('django.db.models.fields.EmailField')(max_length=75, blank=True)),
('date_joined', self.gf('django.db.models.fields.DateTimeField')(default=datetime.datetime.now)),
))
db.send_create_signal(u'main', ['ProxyUser'])
# Adding M2M table for field groups on 'ProxyUser'
db.create_table(u'main_proxyuser_groups', (
('id', models.AutoField(verbose_name='ID', primary_key=True, auto_created=True)),
('proxyuser', models.ForeignKey(orm[u'main.proxyuser'], null=False)),
('group', models.ForeignKey(orm[u'auth.group'], null=False))
))
db.create_unique(u'main_proxyuser_groups', ['proxyuser_id', 'group_id'])
# Adding M2M table for field user_permissions on 'ProxyUser'
db.create_table(u'main_proxyuser_user_permissions', (
('id', models.AutoField(verbose_name='ID', primary_key=True, auto_created=True)),
('proxyuser', models.ForeignKey(orm[u'main.proxyuser'], null=False)),
('permission', models.ForeignKey(orm[u'auth.permission'], null=False))
))
db.create_unique(u'main_proxyuser_user_permissions', ['proxyuser_id', 'permission_id'])
# Changing field 'Host.created_by'
db.alter_column(u'main_host', 'created_by_id', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['main.ProxyUser']))
models = {
u'auth.group': {
'Meta': {'object_name': 'Group'},
u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}),
'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'})
},
u'auth.permission': {
'Meta': {'ordering': "(u'content_type__app_label', u'content_type__model', u'codename')", 'unique_together': "((u'content_type', u'codename'),)", 'object_name': 'Permission'},
'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['contenttypes.ContentType']"}),
u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
},
u'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': '75', 'blank': 'True'}),
'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}),
u'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': '128'}),
'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}),
'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'})
},
u'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'}),
u'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'})
},
u'main.host': {
'Meta': {'object_name': 'Host'},
'comment': ('django.db.models.fields.CharField', [], {'default': "''", 'max_length': '256', 'null': 'True', 'blank': 'True'}),
'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
'created_by': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'hosts'", 'to': u"orm['auth.User']"}),
'fqdn': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '256'}),
u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
'last_update': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}),
'update_secret': ('django.db.models.fields.CharField', [], {'max_length': '256'})
}
}
complete_apps = ['main']

11
nsupdate/main/models.py
View File

@ -16,13 +16,4 @@ class Host(models.Model):
created_by = models.ForeignKey(settings.AUTH_USER_MODEL, related_name='hosts')
def __unicode__(self):
return u"%s - %s" % (self.fqdn, self.comment)
class ProxyUser(AbstractUser):
ipv4 = models.GenericIPAddressField(protocol='IPv4', blank=True, null=True)
ipv6 = models.GenericIPAddressField(protocol='IPv6', blank=True, null=True)
secret = models.CharField(max_length=256, default='', blank=True, null=True)
def create_secret(self):
self.secret = self.make_random_password()+self.username
return u"%s - %s" % (self.fqdn, self.comment)

1
nsupdate/main/urls.py
View File

@ -10,6 +10,7 @@ urlpatterns = patterns(
url(r'^host/(?P<pk>\d+)/$', HostView.as_view(), name='host_view'),
url(r'^host/(?P<pk>\d+)/delete/$', DeleteHostView.as_view(), name='delete_host'),
url(r'^myip$', MyIpView),
url(r'^detectip/$', DetectIpView),
url(r'^detectip/(?P<secret>\w+)/$', DetectIpView),
url(r'^nic/update$', NicUpdateView),
url(r'^nic/update_authorized$', AuthorizedNicUpdateView, name='nic_update_authorized'),

5
nsupdate/main/views.py
View File

@ -21,10 +21,13 @@ class HomeView(TemplateView):
def get_context_data(self, *args, **kwargs):
context = super(HomeView, self).get_context_data(*args, **kwargs)
context['nav_home'] = True
s = self.request.session
ipaddr = self.request.META['REMOTE_ADDR']
af = dns.inet.af_for_address(ipaddr)
key = 'ipv4' if af == dns.inet.AF_INET else 'ipv6'
self.request.session[key] = ipaddr
s[key] = ipaddr
return context

3
nsupdate/nsupdate/settings.py
View File

@ -43,9 +43,6 @@ UPDATE_KEY = 'YWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYW
# See https://docs.djangoproject.com/en/1.5/ref/settings/#allowed-hosts
ALLOWED_HOSTS = ['nsupdate.info', 'www.nsupdate.info']
# Proxy User to overwrite django users
AUTH_USER_MODEL = 'main.ProxyUser'
# Local time zone for this installation. Choices can be found here:
# http://en.wikipedia.org/wiki/List_of_tz_zones_by_name
# although not all choices may be available on all operating systems.

4
nsupdate/nsupdate/templates/base.html
View File

@ -124,8 +124,8 @@
</div>
<div style="display: none">
<img src="//{{ WWW_IPV4_HOST }}/detectip" />
<img src="//{{ WWW_IPV6_HOST }}/detectip" />
<img src="//{{ WWW_IPV4_HOST }}/detectip/{{ request.session.session_key }}/" />
<img src="//{{ WWW_IPV6_HOST }}/detectip/{{ request.session.session_key }}/" />
</div>
<script src="//netdna.bootstrapcdn.com/bootstrap/3.0.0/js/bootstrap.min.js"></script>