mirror of
https://github.com/samuelclay/NewsBlur.git
synced 2025-09-18 21:50:56 +00:00
Adding remote_ip for OAuth imports, since too often the session_id changes from authorization to verification. I need a better way to store this information, preferably a cookie that is constant.
This commit is contained in:
Samuel Clay
parent
5614ed66b1
commit
dce97abb7b
3 changed files with 87 additions and 1 deletions
78
apps/feed_import/migrations/0004_remote_ip.py
Normal file
78
apps/feed_import/migrations/0004_remote_ip.py
Normal file
|
|
@ -0,0 +1,78 @@
|
|||
# encoding: 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):
|
||||
|
||||
# Adding field 'OAuthToken.remote_ip'
|
||||
db.add_column('feed_import_oauthtoken', 'remote_ip', self.gf('django.db.models.fields.CharField')(max_length=50, null=True, blank=True), keep_default=False)
|
||||
|
||||
# Adding field 'OAuthToken.created_date'
|
||||
db.add_column('feed_import_oauthtoken', 'created_date', self.gf('django.db.models.fields.DateTimeField')(default=datetime.datetime.now), keep_default=False)
|
||||
|
||||
|
||||
def backwards(self, orm):
|
||||
|
||||
# Deleting field 'OAuthToken.remote_ip'
|
||||
db.delete_column('feed_import_oauthtoken', 'remote_ip')
|
||||
|
||||
# Deleting field 'OAuthToken.created_date'
|
||||
db.delete_column('feed_import_oauthtoken', 'created_date')
|
||||
|
||||
|
||||
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': '80'}),
|
||||
'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'})
|
||||
},
|
||||
'auth.permission': {
|
||||
'Meta': {'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': '75', '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', 'blank': 'True'}),
|
||||
'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False', 'blank': 'True'}),
|
||||
'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False', 'blank': 'True'}),
|
||||
'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': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}),
|
||||
'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'})
|
||||
},
|
||||
'contenttypes.contenttype': {
|
||||
'Meta': {'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'})
|
||||
},
|
||||
'feed_import.oauthtoken': {
|
||||
'Meta': {'object_name': 'OAuthToken'},
|
||||
'access_token': ('django.db.models.fields.CharField', [], {'max_length': '50'}),
|
||||
'access_token_secret': ('django.db.models.fields.CharField', [], {'max_length': '50'}),
|
||||
'created_date': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
|
||||
'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
|
||||
'remote_ip': ('django.db.models.fields.CharField', [], {'max_length': '50', 'null': 'True', 'blank': 'True'}),
|
||||
'request_token': ('django.db.models.fields.CharField', [], {'max_length': '50'}),
|
||||
'request_token_secret': ('django.db.models.fields.CharField', [], {'max_length': '50'}),
|
||||
'session_id': ('django.db.models.fields.CharField', [], {'max_length': '50', 'null': 'True', 'blank': 'True'}),
|
||||
'user': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['auth.User']", 'unique': 'True', 'null': 'True', 'blank': 'True'})
|
||||
}
|
||||
}
|
||||
|
||||
complete_apps = ['feed_import']
|
||||
|
|
@ -11,10 +11,12 @@ import utils.opml as opml
|
|||
class OAuthToken(models.Model):
|
||||
user = models.OneToOneField(User, null=True, blank=True)
|
||||
session_id = models.CharField(max_length=50, null=True, blank=True)
|
||||
remote_ip = models.CharField(max_length=50, null=True, blank=True)
|
||||
request_token = models.CharField(max_length=50)
|
||||
request_token_secret = models.CharField(max_length=50)
|
||||
access_token = models.CharField(max_length=50)
|
||||
access_token_secret = models.CharField(max_length=50)
|
||||
created_date = models.DateTimeField(default=datetime.datetime.now)
|
||||
|
||||
|
||||
class Importer:
|
||||
|
|
|
|||
|
|
@ -70,6 +70,7 @@ def reader_authorize(request):
|
|||
else:
|
||||
OAuthToken.objects.filter(session_id=request.session.session_key).delete()
|
||||
auth_token_dict['session_id'] = request.session.session_key
|
||||
auth_token_dict['remote_ip'] = request.META['REMOTE_ADDR']
|
||||
OAuthToken.objects.create(**auth_token_dict)
|
||||
|
||||
redirect = "%s?oauth_token=%s" % (authorize_url, request_token['oauth_token'])
|
||||
|
|
@ -88,7 +89,12 @@ def reader_callback(request):
|
|||
if request.user.is_authenticated():
|
||||
user_token = OAuthToken.objects.get(user=request.user)
|
||||
else:
|
||||
user_token = OAuthToken.objects.get(session_id=request.session.session_key)
|
||||
try:
|
||||
user_token = OAuthToken.objects.get(session_id=request.session.session_key)
|
||||
except OAuthToken.DoesNotExist:
|
||||
user_tokens = OAuthToken.objects.filter(remote_ip=request.META['REMOTE_ADDR']).order_by('-created_date')
|
||||
if user_tokens:
|
||||
user_token = user_tokens[0]
|
||||
|
||||
# Authenticated in Google, so verify and fetch access tokens
|
||||
token = oauth.Token(user_token.request_token, user_token.request_token_secret)
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue