Skip to content
Snippets Groups Projects
Commit a5662364 authored by ktongxue2018's avatar ktongxue2018
Browse files

modified: app/models.py 

	modified:   app/views.py
parent 6d08df3d
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 76 additions and 95 deletions
.idea/workspace.xml
+ 50
− 73
View file @ a5662364
......@@ -2,6 +2,7 @@
<project version="4">
<component name="ChangeListManager">
<list default="true" id="ce95be28-16fc-41cd-8c98-36369485281e" name="Default Changelist" comment="">
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/models.py" beforeDir="false" afterPath="$PROJECT_DIR$/app/models.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/views.py" beforeDir="false" afterPath="$PROJECT_DIR$/app/views.py" afterDir="false" />
</list>
......@@ -50,14 +51,32 @@
</counts>
</usages-collector>
</session>
<session id="1835633884">
<usages-collector id="statistics.lifecycle.project">
<counts>
<entry key="project.open.time.4" value="1" />
<entry key="project.opened" value="1" />
</counts>
</usages-collector>
<usages-collector id="statistics.file.extensions.edit">
<counts>
<entry key="py" value="104" />
</counts>
</usages-collector>
<usages-collector id="statistics.file.types.edit">
<counts>
<entry key="Python" value="104" />
</counts>
</usages-collector>
</session>
</component>
<component name="FileEditorManager">
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/app/views.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="228">
<caret line="38" column="37" selection-start-line="38" selection-start-column="13" selection-end-line="38" selection-end-column="37" />
<state relative-caret-position="171">
<caret line="17" column="8" selection-start-line="17" selection-start-column="8" selection-end-line="17" selection-end-column="8" />
<folding>
<element signature="e#0#15#0" expanded="true" />
</folding>
......@@ -69,7 +88,7 @@
<entry file="file://$PROJECT_DIR$/run.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="57">
<caret line="3" column="23" selection-start-line="3" selection-start-column="23" selection-end-line="3" selection-end-column="23" />
<caret line="3" column="31" lean-forward="true" selection-start-line="3" selection-start-column="31" selection-end-line="3" selection-end-column="31" />
</state>
</provider>
</entry>
......@@ -77,7 +96,7 @@
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/instance/config.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-121">
<state relative-caret-position="95">
<caret line="5" column="11" selection-start-line="5" selection-start-column="11" selection-end-line="5" selection-end-column="11" />
</state>
</provider>
......@@ -86,28 +105,8 @@
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/app/static/reg.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="693">
<state relative-caret-position="12578">
<caret line="662" selection-start-line="662" selection-end-line="662" />
<folding>
<element signature="e#10296#10322#0" expanded="true" />
<element signature="e#10409#10434#0" expanded="true" />
<element signature="e#10530#10571#0" expanded="true" />
<element signature="e#18926#18948#0" expanded="true" />
<element signature="e#19039#19107#0" expanded="true" />
<element signature="e#19138#19164#0" expanded="true" />
<element signature="e#20761#20884#0" expanded="true" />
<element signature="e#21812#21935#0" expanded="true" />
<element signature="e#22863#22986#0" expanded="true" />
<element signature="e#23915#24031#0" expanded="true" />
<element signature="e#24978#25092#0" expanded="true" />
<element signature="e#26137#26245#0" expanded="true" />
<element signature="e#26388#26498#0" expanded="true" />
<element signature="e#36537#36556#0" expanded="true" />
<element signature="e#36662#36689#0" expanded="true" />
<element signature="e#47725#47745#0" expanded="true" />
<element signature="e#47779#47799#0" expanded="true" />
<element signature="e#48109#48175#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
......@@ -115,7 +114,7 @@
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/app/static/reset.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="10963">
<state relative-caret-position="11894">
<caret line="626" column="32" selection-start-line="626" selection-start-column="32" selection-end-line="626" selection-end-column="32" />
</state>
</provider>
......@@ -156,11 +155,10 @@
<file pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/app/models.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="130">
<caret line="100" column="27" selection-start-line="100" selection-start-column="27" selection-end-line="100" selection-end-column="27" />
<state relative-caret-position="228">
<caret line="36" column="51" selection-start-line="36" selection-start-column="51" selection-end-line="36" selection-end-column="51" />
<folding>
<element signature="e#0#72#0" expanded="true" />
<marker date="1554563372847" expanded="true" signature="2166:2317" ph="..." />
</folding>
</state>
</provider>
......@@ -207,8 +205,8 @@
</option>
</component>
<component name="ProjectFrameBounds" extendedState="7">
<option name="x" value="36" />
<option name="y" value="32" />
<option name="x" value="35" />
<option name="y" value="31" />
<option name="width" value="1940" />
<option name="height" value="1100" />
</component>
......@@ -471,34 +469,31 @@
<entry file="file://$PROJECT_DIR$/app/static/mail_set_passwd.html">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/config.py">
<entry file="file://$PROJECT_DIR$/instance/config.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="456">
<caret line="24" column="12" selection-start-line="24" selection-start-column="12" selection-end-line="24" selection-end-column="12" />
<state relative-caret-position="95">
<caret line="5" column="11" selection-start-line="5" selection-start-column="11" selection-end-line="5" selection-end-column="11" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/static/mail_reset_passwd.html">
<entry file="file://$PROJECT_DIR$/app/static/reg.html">
<provider selected="true" editor-type-id="text-editor">
<state>
<caret column="2" selection-start-column="2" selection-end-column="2" />
<state relative-caret-position="12578">
<caret line="662" selection-start-line="662" selection-end-line="662" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/__init__.py">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/app/static/reset.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="10963">
<state relative-caret-position="11894">
<caret line="626" column="32" selection-start-line="626" selection-start-column="32" selection-end-line="626" selection-end-column="32" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/instance/config.py">
<entry file="file://$PROJECT_DIR$/config.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-121">
<caret line="5" column="11" selection-start-line="5" selection-start-column="11" selection-end-line="5" selection-end-column="11" />
<state relative-caret-position="456">
<caret line="24" column="12" selection-start-line="24" selection-start-column="12" selection-end-line="24" selection-end-column="12" />
</state>
</provider>
</entry>
......@@ -509,44 +504,27 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/static/reg.html">
<entry file="file://$PROJECT_DIR$/app/static/mail_reset_passwd.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="693">
<caret line="662" selection-start-line="662" selection-end-line="662" />
<folding>
<element signature="e#10296#10322#0" expanded="true" />
<element signature="e#10409#10434#0" expanded="true" />
<element signature="e#10530#10571#0" expanded="true" />
<element signature="e#18926#18948#0" expanded="true" />
<element signature="e#19039#19107#0" expanded="true" />
<element signature="e#19138#19164#0" expanded="true" />
<element signature="e#20761#20884#0" expanded="true" />
<element signature="e#21812#21935#0" expanded="true" />
<element signature="e#22863#22986#0" expanded="true" />
<element signature="e#23915#24031#0" expanded="true" />
<element signature="e#24978#25092#0" expanded="true" />
<element signature="e#26137#26245#0" expanded="true" />
<element signature="e#26388#26498#0" expanded="true" />
<element signature="e#36537#36556#0" expanded="true" />
<element signature="e#36662#36689#0" expanded="true" />
<element signature="e#47725#47745#0" expanded="true" />
<element signature="e#47779#47799#0" expanded="true" />
<element signature="e#48109#48175#0" expanded="true" />
</folding>
<state>
<caret column="2" selection-start-column="2" selection-end-column="2" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/__init__.py">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/run.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="57">
<caret line="3" column="23" selection-start-line="3" selection-start-column="23" selection-end-line="3" selection-end-column="23" />
<caret line="3" column="31" lean-forward="true" selection-start-line="3" selection-start-column="31" selection-end-line="3" selection-end-column="31" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/views.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="228">
<caret line="38" column="37" selection-start-line="38" selection-start-column="13" selection-end-line="38" selection-end-column="37" />
<state relative-caret-position="171">
<caret line="17" column="8" selection-start-line="17" selection-start-column="8" selection-end-line="17" selection-end-column="8" />
<folding>
<element signature="e#0#15#0" expanded="true" />
</folding>
......@@ -555,11 +533,10 @@
</entry>
<entry file="file://$PROJECT_DIR$/app/models.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="130">
<caret line="100" column="27" selection-start-line="100" selection-start-column="27" selection-end-line="100" selection-end-column="27" />
<state relative-caret-position="228">
<caret line="36" column="51" selection-start-line="36" selection-start-column="51" selection-end-line="36" selection-end-column="51" />
<folding>
<element signature="e#0#72#0" expanded="true" />
<marker date="1554563372847" expanded="true" signature="2166:2317" ph="..." />
</folding>
</state>
</provider>
......
app/__pycache__/__init__.cpython-37.pyc
+ 0
− 0
View file @ a5662364
No preview for this file type
app/__pycache__/models.cpython-37.pyc
+ 0
− 0
View file @ a5662364
No preview for this file type
app/__pycache__/views.cpython-37.pyc
+ 0
− 0
View file @ a5662364
No preview for this file type
app/models.py
+ 13
− 9
View file @ a5662364
......@@ -34,12 +34,13 @@ class ldap_control:
self.s = Server(host = self.host,port = self.port)
self.c = Connection(self.s,user = self.admin_dn,password = self.admin_passwd,auto_bind=True)
print(self.s.check_availability())
self.server_pool = ServerPool([self.s,self.s], active=True, exhaust=True)
self.c = Connection(self.server_pool,user = self.admin_dn,password = self.admin_passwd,auto_bind=True)
def keep(self):
if (self.s.check_availability() != True):
self.s = Server(host = self.host,port = self.port)
self.c = Connection(self.s,user = self.admin_dn,password = self.admin_passwd,auto_bind=True)
self.c = Connection(self.server_pool,user = self.admin_dn,password = self.admin_passwd,auto_bind=True)
def result(self):
print(self.c.result)
......@@ -47,9 +48,10 @@ class ldap_control:
self.c.search(self.user_dn,search_filter=f'(cn={name})')
s = str(self.c.entries)
mail = findall('(?<=mail\=).*?(?=,)',s)
print(mail)
return mail[0]
try:
return mail[0]
except:
pass
def mail_to_username(self,mail):
#检查邮箱
self.c.search(self.user_dn,search_filter=f"(mail={mail})")
......@@ -57,8 +59,10 @@ class ldap_control:
s = str(self.c.entries)
name = findall('(?<=\=).*?(?=,)',s)
print(name[0])
return name[0]
try:
return name[0]
except:
pass
def select_email_or_name(self,str):
"""
判断 输入为用户名还是邮箱
......
app/views.py
+ 13
− 13
View file @ a5662364
......@@ -11,19 +11,19 @@ def reg_user():
return send_file('./static/reg.html')
elif request.method == "POST":
user_input = request.form
try:
u = User(user_input)
u.creat_ldap_account(l)
return redirect('/cas/')
except:
return """
Error input.<br>
Please check:<br>
username:[A-Za-z0-9]<br>
email:^[A-Za-z0-9\.\+_-]+@[A-Za-z0-9\._-]+\.[a-zA-Z]*$<br>
or (email | username) is exist.
"""
#try:
u = User(user_input)
u.creat_ldap_account(l)
return redirect('/cas/')
#except:
#return """
#Error input.<br>
#Please check:<br>
#username:[A-Za-z0-9]<br>
#email:^[A-Za-z0-9\.\+_-]+@[A-Za-z0-9\._-]+\.[a-zA-Z]*$<br>
#or (email | username) is exist.
#"""
......
instance/__pycache__/__init__.cpython-37.pyc
+ 0
− 0
View file @ a5662364
No preview for this file type
instance/__pycache__/config.cpython-37.pyc
+ 0
− 0
View file @ a5662364
No preview for this file type
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment