diff options
Diffstat (limited to 'coip/apps/userprofile/models.py')
| -rw-r--r-- | coip/apps/userprofile/models.py | 43 |
1 files changed, 10 insertions, 33 deletions
diff --git a/coip/apps/userprofile/models.py b/coip/apps/userprofile/models.py index 6e2364a..315097d 100644 --- a/coip/apps/userprofile/models.py +++ b/coip/apps/userprofile/models.py @@ -7,15 +7,14 @@ from django.db import models from django.contrib.auth.models import User from django.dispatch.dispatcher import receiver from django.db.models.signals import post_save -from coip.apps.name.models import Name, lookup -from coip.apps.membership.models import add_member +from coip.apps.name.models import Name class UserProfile(models.Model): INTERNAL = 0 ENTITY = 1 SSHKEY = 2 - GRIDCERT = 3 + X509 = 3 FEDID = 4 # @@ -24,19 +23,20 @@ class UserProfile(models.Model): # 1 (entity) - username=entity:sha1(entityID), profile.display_name = display or entityID, profile.identifier = ssh key # 2 (sshkey) - username=sshkey:fingerprint, profile.display_name = key alias or "SSH Key with fingerprint ..." # 3 (gridcert) - username=x509:sha1-fingerprint, profile.display_name = dn, profile.identifier = PEM - # 4 (fedid) - username=eppn or equiv (REMOTE_USER),profile.display_name = display or eppn, profile.identifier = eppn, profile.authority = idp + # 4 (fedid) - username=eppn or equiv (REMOTE_USER),profile.display_name = display or eppn, profile.identifier = eppn, profile.idp = idp # - user = models.OneToOneField(User) + user = models.OneToOneField(User,related_name='profile') home = models.ForeignKey(Name,blank=True,null=True) display_name = models.CharField(max_length=255,blank=True,null=True) - type = models.SmallIntegerField(choices=((ENTITY,"Connected Service"), + type = models.SmallIntegerField(default=INTERNAL, + choices=((ENTITY,"Service"), (INTERNAL,"System User"), - (SSHKEY,"SSH Key"), - (GRIDCERT,"eScience Certificate"), + (SSHKEY,"Personal SSH Key"), + (X509,"Personal eScience Certificate"), (FEDID,"User Identity"))) - authority = models.CharField(max_length=255,blank=True,null=True) + idp = models.CharField(max_length=255,blank=True,null=True) identifier = models.CharField(max_length=1023,blank=True,null=True) timecreated = models.DateTimeField(auto_now_add=True) @@ -45,30 +45,7 @@ class UserProfile(models.Model): def __unicode__(self): return "%s [%s] - %s" % (self.identifier,self.user.username,self.display_name) -def import_sshkey(keyfile): - fingerprint = "xxx" - user = User.objects.get_or_create(username="sshkey:%s" % fingerprint) - -def home_name(user,short=None,autocreate=False): - if short == None: - short = user.username - urn = lookup("urn",True) - anyuser = lookup("system:anyuser",True) - urn.setacl(anyuser,'rl') - - home = lookup('user:'+user.username,autocreate=autocreate) - add_member(home,user,hidden=True) - home.setpacl(home, "rwlida") - home.setacl(home,"rwlia") #don't allow users to delete or reset acls on their home, nor invite members - that would be confusing as hell - home.short = short - home.save() - - return home - @receiver(post_save,sender=User) def _create_profile(sender,**kwargs): user = kwargs['instance'] - profile,created = UserProfile.objects.get_or_create(user=user) - if profile.home == None: - profile.home = home_name(user,autocreate=True) - profile.save()
\ No newline at end of file + UserProfile.objects.get_or_create(user=user)
\ No newline at end of file |