← Back to branch summary

~azzar1/unity/add-show-desktop-key

« back to all changes in this revision

Viewing changes to services/usrmgt-server

  • Committer: me at id
  • Date: 2009-01-15 01:29:07 UTC
  • mto: This revision was merged to the branch mainline in revision 1090.
  • Revision ID: svn-v3-trunk0:2b9c9e99-6f39-0410-b283-7f802c844ae2:branches%2Fstorm:1147
ivle.makeuser: Don't create a local.auth. It wasn't used anywhere, and seems
    to have only been there for historical reasons.
setup.configure: Remove svn_auth_local from the config.py boilerplate; it was
    used solely by ivle.makeuser.

Show diffs side-by-side

added added

removed removed

Lines of Context:
services/usrmgt-server
27
27
#   - Rebuild svn auth file
28
28
#   - Rebuild passwd + push to nodes.
29
29
 
30
 
def activate_user(store, props):
 
30
def activate_user(props):
31
31
    """Create the on-disk stuff for the given user.
32
32
       Sets the state of the user in the db from pending to enabled.
33
33
       Expected properties:
40
40
 
41
41
    login = props['login']
42
42
 
43
 
    # FIXME: check we're pending
44
 
 
45
 
    # Get the full User object from the db associated with this
46
 
    user = ivle.database.User.get_by_login(store, login)
47
 
 
48
 
    # make svn config/auth
49
 
    repopath = os.path.join(ivle.conf.svn_repo_path, 'users', login)
50
 
    logging.debug("Creating user's Subversion repository")
51
 
    ivle.makeuser.make_svn_repo(repopath, throw_on_error=True)
52
 
 
53
 
    rebuild_svn_config(store, props)
54
 
 
55
 
    logging.debug("Adding Subversion authentication")
56
 
    passwd = ivle.makeuser.make_svn_auth(store, login,
57
 
                                         throw_on_error=True)
58
 
 
59
 
    logging.debug("Creating jail")
60
 
    ivle.makeuser.make_jail(user)
61
 
 
62
 
    logging.info("Enabling user")
63
 
    user.state = u'enabled'
64
 
 
65
 
    return {"response": "okay"}
66
 
 
67
 
def rebuild_svn_config(store, props):
 
43
    store = ivle.database.get_store()
 
44
 
 
45
    try:
 
46
 
 
47
        # FIXME: check we're pending
 
48
 
 
49
        # Get the full User object from the db associated with this
 
50
        user = ivle.database.User.get_by_login(store, login)
 
51
 
 
52
        # make svn config/auth
 
53
 
 
54
        repopath = os.path.join(ivle.conf.svn_repo_path, 'users', login)
 
55
        logging.debug("Creating user's Subversion repository")
 
56
        ivle.makeuser.make_svn_repo(repopath, throw_on_error=True)
 
57
 
 
58
        rebuild_svn_config(props)
 
59
 
 
60
        logging.debug("Adding Subversion authentication")
 
61
        passwd = ivle.makeuser.make_svn_auth(store, login,
 
62
                                             throw_on_error=True)
 
63
        logging.debug("passwd: %s" % passwd)
 
64
 
 
65
        logging.debug("Creating jail")
 
66
        ivle.makeuser.make_jail(login, user.unixid, svn_pass=passwd)
 
67
 
 
68
        logging.info("Enabling user")
 
69
        user.state = u'enabled'
 
70
 
 
71
        store.commit()
 
72
 
 
73
        return {"response": "okay"}
 
74
 
 
75
    finally:
 
76
        store.close()
 
77
 
 
78
def rebuild_svn_config(props):
68
79
    """Rebuilds the svn config file
69
80
    Return value:
70
81
        response (okay, failure)
71
82
    """
72
83
    try:
73
 
        ivle.makeuser.rebuild_svn_config(store)
 
84
        ivle.makeuser.rebuild_svn_config()
74
85
    except Exception, e:
75
86
        logging.warning('Rebuild of Subversion authorization config failed!')
76
87
        return{'response': 'failure', 'msg': repr(e)}
77
88
 
78
89
    return {'response': 'okay'}
79
90
 
80
 
def rebuild_svn_group_config(store, props):
 
91
def rebuild_svn_group_config(props):
81
92
    """Rebuilds the svn group config file
82
93
    Return value:
83
94
        response (okay, failure)
84
95
    """
85
96
    try:
86
 
        ivle.makeuser.rebuild_svn_group_config(store)
 
97
        ivle.makeuser.rebuild_svn_group_config()
87
98
    except Exception, e:
88
99
        logging.warning(
89
100
            'Rebuild of Subversion group authorization config failed!')
91
102
 
92
103
    return {'response': 'okay'}
93
104
 
94
 
def create_group_repository(store, props):
 
105
def create_group_repository(props):
95
106
    """Creates on disk repository for the given group
96
107
    Expected properties:
97
108
        subj_short_name, year, semester, groupnm
134
145
 
135
146
def dispatch(props):
136
147
    logging.debug(repr(props))
137
 
 
138
 
    store = ivle.database.get_store()
139
148
    action = props.keys()[0]
140
 
    res = actions[action](store, props[action])
141
 
 
142
 
    if res['response'] == 'okay':
143
 
        store.commit()
144
 
    else:
145
 
        store.rollback()
146
 
    store.close()
147
 
    return res
 
149
    return actions[action](props[action])
148
150
 
149
151
if __name__ == "__main__":
150
152
    pid = os.getpid()