downhill/vuejs-userservice
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

fixed some things

Browse source
This commit is contained in:
downhill 2018-11-07 12:08:46 +00:00
parent 39f08c7939
commit b512ee2f61
3 changed files with 11 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
dal/dal/views.py
View file

@ -17,6 +17,10 @@ from datetime import datetime
from django_nameko import get_pool from django_nameko import get_pool
from random import choice, randint from random import choice, randint
import string import string
from configparser import ConfigParser
config = ConfigParser()
config.read('userservice.conf')
# Check to see if the username is already taken # Check to see if the username is already taken
# Helper function, not to be set up as a view # Helper function, not to be set up as a view
@ -226,7 +230,7 @@ class ResetPassword(View):
# getting epoch for the time now in UTC to spare us headache with timezones # getting epoch for the time now in UTC to spare us headache with timezones
creationtime = int(datetime.utcnow().timestamp()) creationtime = int(datetime.utcnow().timestamp())
# Construct the data for the email # Construct the data for the email
email_from = 'Userservice at ungleich <root@localhost>' email_from = 'Userservice at ungleich <%s>' % config['EMAIL']['EMAILFROM']
to = ['%s <%s>' % (user, email)] to = ['%s <%s>' % (user, email)]
subject = 'Password reset request for %s' % user subject = 'Password reset request for %s' % user
link = self.build_reset_link(user, creationtime) link = self.build_reset_link(user, creationtime)
@ -252,7 +256,7 @@ class ResetPassword(View):
# Builds the reset link for the email and puts the token into the database # Builds the reset link for the email and puts the token into the database
def build_reset_link(self, user, epochutc): def build_reset_link(self, user, epochutc):
# set up the data # set up the data
host = 'localhost:8000' host = 'account-staging.ungleich.ch'
tokengen = PasswordResetTokenGenerator() tokengen = PasswordResetTokenGenerator()
# create some noise for use in the tokengenerator # create some noise for use in the tokengenerator
pseudouser = PseudoUser() pseudouser = PseudoUser()

4
dal/userservice.conf.example
View file

@ -4,6 +4,10 @@
RABBITMQ = guest:guest@127.0.0.1 RABBITMQ = guest:guest@127.0.0.1
[EMAIL]
EMAILFROM = info@ungleich.ch
[LDAP] [LDAP]
# Set up the user who can search # Set up the user who can search

3
nameko-func.py
View file

@ -62,7 +62,7 @@ def objclasses(rdn, uid, connection):
connection.search(rdn, '(%s)' % uid, attributes=['objectClass']) connection.search(rdn, '(%s)' % uid, attributes=['objectClass'])
objclass = [] objclass = []
# get the relevant data # get the relevant data
tmp = conn.entries[0]['objectClass'] tmp = connection.entries[0]['objectClass']
# This one sets up the array # This one sets up the array
for y in tmp: for y in tmp:
objclass.append(y) objclass.append(y)
@ -116,7 +116,6 @@ class CreateUser(object):
# set objectClasses for the new user # set objectClasses for the new user
obj_new_user = ObjectDef(['inetOrgPerson', 'posixAccount', 'ldapPublicKey'], conn) obj_new_user = ObjectDef(['inetOrgPerson', 'posixAccount', 'ldapPublicKey'], conn)
w = Writer(conn, obj_new_user) w = Writer(conn, obj_new_user)
# newly created users get put into ou=customers
dn = 'uid=%s,ou=users,dc=ungleich,dc=ch' % user dn = 'uid=%s,ou=users,dc=ungleich,dc=ch' % user
w.new(dn) w.new(dn)
# Filling in some of the data # Filling in some of the data