Infrastructure/fedora-infrastructure
1
0
Fork 0
Code Issues 70 Pull requests Projects Releases Packages Wiki Activity Actions

Use authentication when grabbing password data

Browse source
This commit is contained in:
Michael McGrath 2008-02-28 11:48:10 -06:00
parent e89c3f53df
commit f0dacb5893
3 changed files with 12 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

7
fas/client/fasClient.py
View file

@ -66,6 +66,7 @@ class MakeShellAccounts(BaseClient):
file = open('/tmp/shadow.txt', 'w') file = open('/tmp/shadow.txt', 'w')
if not people: if not people:
people = self.people_list() people = self.people_list()
print people
for person in people: for person in people:
uid = person['id'] uid = person['id']
username = person['username'] username = person['username']
@ -170,7 +171,11 @@ class MakeShellAccounts(BaseClient):
if __name__ == '__main__': if __name__ == '__main__':
fas = MakeShellAccounts(FAS_URL, 'admin', None, None) try:
fas = MakeShellAccounts(FAS_URL, 'admin', 'admin', 1)
except AuthError, e:
print e
sys.exit(1)
fas.make_group_db() fas.make_group_db()
fas.make_passwd_db() fas.make_passwd_db()
fas.make_shadow_db() fas.make_shadow_db()

4
fas/fas/json_request.py
View file

@ -21,6 +21,7 @@ class JsonRequest(controllers.Controller):
'''Perhaps show a nice explanatory message about groups here?''' '''Perhaps show a nice explanatory message about groups here?'''
return dict(help='This is a json interface') return dict(help='This is a json interface')
@identity.require(turbogears.identity.not_anonymous())
@expose("json", allow_json=True) @expose("json", allow_json=True)
def group_list(self, search='*'): def group_list(self, search='*'):
re_search = re.sub(r'\*', r'%', search).lower() re_search = re.sub(r'\*', r'%', search).lower()
@ -29,7 +30,8 @@ class JsonRequest(controllers.Controller):
for group in groups: for group in groups:
memberships[group.id] = group.approved_roles memberships[group.id] = group.approved_roles
return dict(groups=groups, memberships=memberships) return dict(groups=groups, memberships=memberships)
@identity.require(turbogears.identity.not_anonymous())
@expose("json", allow_json=True) @expose("json", allow_json=True)
def people_list(self, search='*'): def people_list(self, search='*'):
re_search = re.sub(r'\*', r'%', search).lower() re_search = re.sub(r'\*', r'%', search).lower()

4
fas/fas/model.py
View file

@ -42,6 +42,7 @@ from turbogears.database import session
from turbogears import identity from turbogears import identity
from fas.json import SABase from fas.json import SABase
# Soon we'll use this instead: # Soon we'll use this instead:
#from fedora.tg.json import SABase #from fedora.tg.json import SABase
@ -244,7 +245,8 @@ class People(SABase):
del props['postal_address'] del props['postal_address']
del props['telephone'] del props['telephone']
del props['facsimile'] del props['facsimile']
elif not identity.current.user.username == self.username: # Below should check for group accounts instead of a specific username
elif not identity.current.user.username == self.username and not identity.current.user.username == 'admin':
# Only an admin or the user themselves can see these fields # Only an admin or the user themselves can see these fields
del props['password'] del props['password']
del props['passwordtoken'] del props['passwordtoken']