Skip to content

Commit 6d74a91

Browse files
committed
Add IANA group and import IANA roles
- Legacy-Id: 3696
1 parent ca2168c commit 6d74a91

3 files changed

Lines changed: 21 additions & 1 deletion

File tree

ietf/ietfauth/decorators.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ def has_role(user, role_names):
8686
role_qs = {
8787
"Area Director": Q(person=person, name="ad", group__type="area", group__state="active"),
8888
"Secretariat": Q(person=person, name="secr", group__acronym="secretariat"),
89-
"IANA": Q(person=person, name="delegate", group__acronym="iana"), # FIXME
89+
"IANA": Q(person=person, name="auth", group__acronym="iana"),
9090
}
9191

9292
filter_expr = Q()

redesign/importing/import-groups.py

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -98,6 +98,12 @@
9898
iab_group.type = type_names["ietf"]
9999
iab_group.save()
100100

101+
# create IANA for use with roles for authorization
102+
iana_group, _ = Group.objects.get_or_create(acronym="iana")
103+
iana_group.name = "IANA"
104+
iana_group.state = state_names["active"]
105+
iana_group.type = type_names["ietf"]
106+
iana_group.save()
101107

102108
system = Person.objects.get(name="(System)")
103109

redesign/importing/import-roles.py

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,20 @@
4444
authorized_role = name(RoleName, "auth", "Authorized Individual")
4545
delegate_role = name(RoleName, "delegate", "Delegate")
4646

47+
# import IANA authorized individuals
48+
for o in User.objects.filter(groups__name="IANA"):
49+
print "Importing IANA group memeber", o
50+
51+
if o.username == "amanda.barber@icann.org":
52+
o.username = "amanda.baber@icann.org"
53+
54+
person = PersonOrOrgInfo.objects.filter(iesglogin__login_name=o.username)[0]
55+
56+
group = Group.objects.get(acronym="iana")
57+
email = get_or_create_email(person, create_fake=False)
58+
59+
Role.objects.get_or_create(name=authorized_role, group=group, person=email.person, email=email)
60+
4761
# WGDelegate
4862
for o in WGDelegate.objects.all().order_by("pk"):
4963
print "importing WGDelegate", o.pk, unicode(o.wg).encode("utf-8"), unicode(o.person).encode("utf-8")

0 commit comments

Comments
 (0)