diff options
| -rw-r--r-- | coip/apps/auth/views.py | 7 | ||||
| -rw-r--r-- | coip/apps/name/models.py | 2 |
2 files changed, 6 insertions, 3 deletions
diff --git a/coip/apps/auth/views.py b/coip/apps/auth/views.py index 29b66c2..97807ca 100644 --- a/coip/apps/auth/views.py +++ b/coip/apps/auth/views.py @@ -38,13 +38,16 @@ def accounts_login_federated(request): if not cn: fn = meta(request,'HTTP_GIVENNAME') ln = meta(request,'HTTP_SN') - cn = "%s %s" % (fn,ln) + if fn and ln: + cn = "%s %s" % (fn,ln) if not cn: cn = profile.identifier mail = meta(request,'HTTP_MAIL') - for attrib_name, meta_value in (('display_name',cn),('email',mail)): + idp = meta(request,'Shib-Identity-Provider') + + for attrib_name, meta_value in (('display_name',cn),('email',mail),('idp',idp)): attrib_value = getattr(profile, attrib_name) if meta_value and not attrib_value: setattr(profile,attrib_name,meta_value) diff --git a/coip/apps/name/models.py b/coip/apps/name/models.py index 4de5946..530775f 100644 --- a/coip/apps/name/models.py +++ b/coip/apps/name/models.py @@ -137,7 +137,7 @@ class Name(models.Model): anyuser = lookup("system:anyuser",True) if NameLink.objects.filter(src=self,dst=anyuser,type=NameLink.access_control,data__contains=perm).count() > 0: return True - if NameLink.objects.filter(src=self,type=NameLink.access_control,data__contains=perm,dst__membership__user=user).count() > 0: + if NameLink.objects.filter(src=self,type=NameLink.access_control,data__contains=perm,dst__memberships__user=user).count() > 0: return True if user.is_superuser: |