Bug fixes by NOC.

diff --git a/docs/source/adminguide.rst b/docs/source/adminguide.rst
index 5678123..cab306f 100644 (file)
--- a/docs/source/adminguide.rst
+++ b/docs/source/adminguide.rst
@@ -151,6 +151,16 @@ Configure and run apache::
   /etc/init.d/apache2 restart
   /etc/init.d/shibd restart
 
+The following tokens should be available at the destination, after passing through the apache module::
+
+  SHIB_EPPN = "eppn" # eduPersonPrincipalName
+  SHIB_NAME = "Shib-InetOrgPerson-givenName"
+  SHIB_SURNAME = "Shib-Person-surname"
+  SHIB_CN = "Shib-Person-commonName"
+  SHIB_DISPLAYNAME = "Shib-InetOrgPerson-displayName"
+  SHIB_EP_AFFILIATION = "Shib-EP-Affiliation"
+  SHIB_SESSION_ID = "Shib-Session-ID"
+
 MySQL Setup
 -----------
 

diff --git a/pithos/aai/models.py b/pithos/aai/models.py
index ca964b0..f5bf291 100644 (file)
--- a/pithos/aai/models.py
+++ b/pithos/aai/models.py
@@ -43,7 +43,7 @@ class PithosUser(models.Model):
     realname = models.CharField('Real Name', max_length=255, default='')
     is_admin = models.BooleanField('Admin', default=False)
     affiliation = models.CharField('Affiliation', max_length=255, default='')
-    quota = models.IntegerField('Storage Limit', default=settings.DEFAULT_QUOTA)
+    quota = models.BigIntegerField('Storage Limit', default=settings.DEFAULT_QUOTA)
     auth_token = models.CharField('Authentication Token', max_length=32, null=True)
     auth_token_created = models.DateTimeField('Time of auth token creation')
     auth_token_expires = models.DateTimeField('Time of auth token expiration')

diff --git a/pithos/aai/util.py b/pithos/aai/util.py
index 1d1b024..6c16c01 100644 (file)
--- a/pithos/aai/util.py
+++ b/pithos/aai/util.py
@@ -35,6 +35,7 @@ import hashlib
 
 from time import asctime
 from datetime import datetime, timedelta
+from base64 import b64encode
 
 from django.conf import settings
 from django.db import transaction

diff --git a/pithos/backends/lib/sqlalchemy/groups.py b/pithos/backends/lib/sqlalchemy/groups.py
index e7b1c36..cff3bb6 100644 (file)
--- a/pithos/backends/lib/sqlalchemy/groups.py
+++ b/pithos/backends/lib/sqlalchemy/groups.py
@@ -47,7 +47,7 @@ class Groups(DBWorker):
         columns.append(Column('owner', String(255), primary_key=True))
         columns.append(Column('name', String(255), primary_key=True))
         columns.append(Column('member', String(255), primary_key=True))
-        self.groups = Table('groups', metadata, *columns, mysql_engine='InnoDB', mysql_charset='utf8')
+        self.groups = Table('groups', metadata, *columns, mysql_engine='InnoDB')
         
         # place an index on member
         Index('idx_groups_member', self.groups.c.member)

diff --git a/pithos/backends/lib/sqlalchemy/node.py b/pithos/backends/lib/sqlalchemy/node.py
index cca025e..d24a0b4 100644 (file)
--- a/pithos/backends/lib/sqlalchemy/node.py
+++ b/pithos/backends/lib/sqlalchemy/node.py
@@ -115,7 +115,7 @@ class Node(DBWorker):
                                          onupdate='CASCADE'),
                               autoincrement=False))
         columns.append(Column('path', String(2048), default='', nullable=False))
-        self.nodes = Table('nodes', metadata, *columns, mysql_engine='InnoDB', mysql_charset='utf8')
+        self.nodes = Table('nodes', metadata, *columns, mysql_engine='InnoDB')
         # place an index on path
         Index('idx_nodes_path', self.nodes.c.path)
         
@@ -131,7 +131,7 @@ class Node(DBWorker):
         columns.append(Column('mtime', DECIMAL))
         columns.append(Column('cluster', Integer, nullable=False, default=0,
                               primary_key=True, autoincrement=False))
-        self.statistics = Table('statistics', metadata, *columns, mysql_engine='InnoDB', mysql_charset='utf8')
+        self.statistics = Table('statistics', metadata, *columns, mysql_engine='InnoDB')
         
         #create versions table
         columns=[]
@@ -146,7 +146,7 @@ class Node(DBWorker):
         columns.append(Column('mtime', DECIMAL))
         columns.append(Column('muser', String(255), nullable=False, default=''))
         columns.append(Column('cluster', Integer, nullable=False, default=0))
-        self.versions = Table('versions', metadata, *columns, mysql_engine='InnoDB', mysql_charset='utf8')
+        self.versions = Table('versions', metadata, *columns, mysql_engine='InnoDB')
         Index('idx_versions_node_mtime', self.versions.c.node,
               self.versions.c.mtime)
         
@@ -159,7 +159,7 @@ class Node(DBWorker):
                               primary_key=True))
         columns.append(Column('key', String(255), primary_key=True))
         columns.append(Column('value', String(255)))
-        self.attributes = Table('attributes', metadata, *columns, mysql_engine='InnoDB', mysql_charset='utf8')
+        self.attributes = Table('attributes', metadata, *columns, mysql_engine='InnoDB')
         
         metadata.create_all(self.engine)
         

diff --git a/pithos/backends/lib/sqlalchemy/policy.py b/pithos/backends/lib/sqlalchemy/policy.py
index 4d0d493..f8d54d1 100644 (file)
--- a/pithos/backends/lib/sqlalchemy/policy.py
+++ b/pithos/backends/lib/sqlalchemy/policy.py
@@ -47,7 +47,7 @@ class Policy(DBWorker):
         columns.append(Column('path', String(2048), index=True))
         columns.append(Column('key', String(255)))
         columns.append(Column('value', String(255)))
-        self.policies = Table('policy', metadata, *columns, mysql_engine='InnoDB', mysql_charset='utf8')
+        self.policies = Table('policy', metadata, *columns, mysql_engine='InnoDB')
         metadata.create_all(self.engine)
     
     def policy_set(self, path, policy):

diff --git a/pithos/backends/lib/sqlalchemy/public.py b/pithos/backends/lib/sqlalchemy/public.py
index 6c05f19..741fda3 100644 (file)
--- a/pithos/backends/lib/sqlalchemy/public.py
+++ b/pithos/backends/lib/sqlalchemy/public.py
@@ -43,7 +43,7 @@ class Public(DBWorker):
         metadata = MetaData()
         columns=[]
         columns.append(Column('path', String(2048), index=True))
-        self.public = Table('public', metadata, *columns, mysql_engine='InnoDB', mysql_charset='utf8')
+        self.public = Table('public', metadata, *columns, mysql_engine='InnoDB')
         metadata.create_all(self.engine)
     
     

diff --git a/pithos/backends/lib/sqlalchemy/xfeatures.py b/pithos/backends/lib/sqlalchemy/xfeatures.py
index 8fe84cd..7cdcf1e 100644 (file)
--- a/pithos/backends/lib/sqlalchemy/xfeatures.py
+++ b/pithos/backends/lib/sqlalchemy/xfeatures.py
@@ -51,7 +51,7 @@ class XFeatures(DBWorker):
         columns=[]
         columns.append(Column('feature_id', Integer, primary_key=True))
         columns.append(Column('path', String(2048)))
-        self.xfeatures = Table('xfeatures', metadata, *columns, mysql_engine='InnoDB', mysql_charset='utf8')
+        self.xfeatures = Table('xfeatures', metadata, *columns, mysql_engine='InnoDB')
         # place an index on path
         Index('idx_features_path', self.xfeatures.c.path)
         
@@ -63,7 +63,7 @@ class XFeatures(DBWorker):
         columns.append(Column('key', Integer, primary_key=True,
                               autoincrement=False))
         columns.append(Column('value', String(255), primary_key=True))
-        self.xfeaturevals = Table('xfeaturevals', metadata, *columns, mysql_engine='InnoDB', mysql_charset='utf8')
+        self.xfeaturevals = Table('xfeaturevals', metadata, *columns, mysql_engine='InnoDB')
         
         metadata.create_all(self.engine)