diff --git a/create_account.py b/create_account.py
index b316cd0bca978d77f27a51ea067a3634c675049b..ef77d78b9eed202c406e127fd9b816dbf18dfd10 100755
--- a/create_account.py
+++ b/create_account.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
import sys
import rc_util
diff --git a/dir_verify.py b/dir_verify.py
new file mode 100644
index 0000000000000000000000000000000000000000..0f0127e50b50ebea248a89df0ad1f9a19eb2c545
--- /dev/null
+++ b/dir_verify.py
@@ -0,0 +1,65 @@
+#!/usr/bin/env python
+import sys
+import json
+import shutil
+import rc_util
+from pathlib import Path
+from rc_rmq import RCRMQ
+
+task = 'dir_verify'
+dirs = ['/home', '/data/user', '/data/scratch']
+
+args = rc_util.get_args()
+logger = rc_util.get_logger(args)
+
+# Instantiate rabbitmq object
+rc_rmq = RCRMQ({'exchange': 'RegUsr', 'exchange_type': 'topic'})
+
+def dir_verify(ch, method, properties, body):
+ msg = json.loads(body)
+ username = msg['username']
+ msg['task'] = task
+ msg['success'] = False
+
+ try:
+ for d in dirs:
+ path = Path(d) / msg['username']
+
+ if args.dry_run:
+ logger.info(f'Checking dirs: {path}')
+
+ else:
+ if not path.exists():
+ # Make sure folder exists and with right permission
+ path.mkdir(mode=0o700)
+
+ # Make sure ownership is correct
+ shutil.chown(path, int(msg['uid']), int(msg['gid']))
+
+ logger.debug(f'{path} created')
+
+ msg['success'] = True
+
+ except Exception as exception:
+ logger.error('', exc_info=True)
+
+ # send confirm message
+ rc_rmq.publish_msg({
+ 'routing_key': 'confirm.' + username,
+ 'msg': msg
+ })
+
+ logger.debug(f'User {username} confirmation sent')
+
+ ch.basic_ack(delivery_tag=method.delivery_tag)
+
+
+logger.info(f'Start listening to queue: {task}')
+rc_rmq.start_consume({
+ 'queue': task,
+ 'routing_key': "verify.*",
+ 'cb': dir_verify
+})
+
+logger.info('Disconnected')
+rc_rmq.disconnect()
diff --git a/git_commit.py b/git_commit.py
new file mode 100644
index 0000000000000000000000000000000000000000..3ea965d288dd5c240e0c72d58b00921c91344777
--- /dev/null
+++ b/git_commit.py
@@ -0,0 +1,103 @@
+#!/usr/bin/env python
+import os
+import sh
+import sys
+import json
+import rc_util
+from rc_rmq import RCRMQ
+
+task = 'git_commit'
+
+# Instantiate rabbitmq object
+rc_rmq = RCRMQ({'exchange': 'RegUsr', 'exchange_type': 'topic'})
+
+# Define some location
+repo_location = os.path.expanduser('~/git/rc-users')
+users_dir = repo_location + '/users'
+groups_dir = repo_location + '/groups'
+
+args = rc_util.get_args()
+logger = rc_util.get_logger(args)
+
+if not args.dry_run:
+ git = sh.git.bake('-C', repo_location)
+ ldapsearch = sh.Command('ldapsearch')
+else:
+ git = sh.echo.bake('git', '-C', repo_location)
+ ldapsearch = sh.echo.bake('ldapsearch')
+
+def git_commit(ch, method, properties, body):
+ msg = json.loads(body)
+ username = msg['username']
+ ticketnum = msg.get('ticketnum', 'add-users-' + username.lower())
+ msg['task'] = task
+ msg['success'] = False
+ branch_name = 'issue-' + ticketnum
+ user_ldif = users_dir + f'/{username}.ldif'
+ group_ldif = groups_dir + f'/{username}.ldif'
+
+ logger.info("Received: %s", msg)
+ logger.debug("ticketnum: %s", ticketnum)
+ logger.debug("branch_name: %s", branch_name)
+
+ try:
+
+ logger.debug('git checkout master')
+ git.checkout('master')
+ logger.debug('git pull')
+ git.pull()
+ logger.debug('git checkout -b %s', branch_name)
+ git.checkout('-b', branch_name)
+
+ logger.debug("open(%s, 'w'), open(%s, 'w')", user_ldif, group_ldif)
+ with open(user_ldif, 'w') as ldif_u,\
+ open(group_ldif, 'w') as ldif_g:
+ logger.debug(f"ldapsearch -LLL -x -h ldapserver -b 'dc=cm,dc=cluster' uid={username} > {user_ldif}")
+ ldapsearch('-LLL', '-x', '-h', 'ldapserver', '-b', "dc=cm,dc=cluster", f"uid={username}", _out=ldif_u)
+ logger.debug(f"ldapsearch -LLL -x -h ldapserver -b 'ou=Group,dc=cm,dc=cluster' cn={username} > {group_ldif}")
+ ldapsearch('-LLL', '-x', '-h', 'ldapserver', '-b', "ou=Group,dc=cm,dc=cluster", f"cn={username}", _out=ldif_g)
+ logger.info('user ldif files generated.')
+
+ logger.debug('git add %s', user_ldif)
+ git.add(user_ldif)
+ logger.debug('git add %s', group_ldif)
+ git.add(group_ldif)
+ logger.debug("git commit -m 'Added new cheaha user: %s'", username)
+ git.commit(m="Added new cheaha user: " + username)
+ logger.debug('git checkout master')
+ git.checkout('master')
+
+ logger.debug('git merge %s --no-ff --no-edit', branch_name)
+ git.merge(branch_name, '--no-ff', '--no-edit')
+ logger.debug('git push origin master')
+ git.push('origin', 'master')
+ # merge with gitlab api
+
+ logger.info('Added ldif files and committed to git repo')
+
+ msg['success'] = True
+ except Exception as exception:
+ logger.error('', exc_info=True)
+
+ # Send confirm message
+ logger.debug('rc_rmq.publish_msge()')
+ rc_rmq.publish_msg({
+ 'routing_key': 'confirm.' + username,
+ 'msg': msg
+ })
+ logger.info('confirmation sent')
+
+ # Acknowledge message
+ logger.debug('ch.basic_ack()')
+ ch.basic_ack(delivery_tag=method.delivery_tag)
+
+
+logger.info("Start listening to queue: %s", task)
+rc_rmq.start_consume({
+ 'queue': task,
+ 'routing_key': "verify.*",
+ 'cb': git_commit
+})
+
+logger.info("Disconnected")
+rc_rmq.disconnect()
diff --git a/requirements.txt b/requirements.txt
index 79661ef97fd5d59910f62a106a133840cba2b252..5a9a79de947b027e538fe018037e8b44d6567eba 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,3 +1,4 @@
pika==1.1.0
dataset==1.3.1
Jinja2==2.11.2
+sh==1.12.14
\ No newline at end of file