Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
F
ffbs-website
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Packages & Registries
Packages & Registries
Container Registry
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
ffbs
ffbs-website
Commits
a4cee3c3
Commit
a4cee3c3
authored
Apr 10, 2019
by
Kasalehlia
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Allow spaces in node names
parent
9a1ec83f
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
3 deletions
+3
-3
cgi/approve_key
cgi/approve_key
+1
-1
cgi/newkey
cgi/newkey
+2
-2
No files found.
cgi/approve_key
View file @
a4cee3c3
...
...
@@ -6,7 +6,7 @@ import re
import
subprocess
cgitb
.
enable
()
NAME_PATTERN
=
'^[a-zA-Z0-9-_\.]+$'
NAME_PATTERN
=
'^[a-zA-Z0-9-_\.
]+$'
CODE_PATTERN
=
'^[a-zA-Z0-9]{64}$'
KEY_DIR
=
'/home/kasalehlia/keys/'
...
...
cgi/newkey
View file @
a4cee3c3
...
...
@@ -16,7 +16,7 @@ cgitb.enable()
KEY_DIR
=
'/home/kasalehlia/keys/'
CONTACT_FILE
=
'/home/kasalehlia/contacts.txt'
KEY_PATTERN
=
r
'# ([a-zA-Z0-9-_\.]+) ?#? ?([\S ]+)?\r?\n([0-9a-f]{64})$'
;
KEY_PATTERN
=
r
'# ([a-zA-Z0-9-_\.
]+) ?#? ?([\S ]+)?\r?\n([0-9a-f]{64})$'
;
#KEY_PATTERN = r'# ([\w.- ]+) ?#? ?([\S ]+)?\r?\n([0-9a-f]{64})$';
EMAIL_FROM
=
'keys@freifunk-bs.de'
EMAIL_TO
=
'ffbs-admin@stratum0.org'
...
...
@@ -59,7 +59,7 @@ try:
f
.
write
(
'{},{},{},{}
\n
'
.
format
(
time
.
time
(),
key
,
name
,
contact
))
#s = smtplib.SMTP('localhost')
if
'NOMAIL'
not
in
name
:
msg
=
MIMEText
(
EMAIL_TEXT
.
format
(
name
=
name
,
key
=
key
,
code
=
code
,
quote
=
random
.
choice
(
QUOTES
)[:
-
1
]),
'plain'
,
'utf-8'
)
msg
=
MIMEText
(
EMAIL_TEXT
.
format
(
name
=
name
.
replace
(
' '
,
'%20'
)
,
key
=
key
,
code
=
code
,
quote
=
random
.
choice
(
QUOTES
)[:
-
1
]),
'plain'
,
'utf-8'
)
msg
[
'From'
]
=
EMAIL_FROM
msg
[
'To'
]
=
EMAIL_TO
msg
[
'Subject'
]
=
'Key approval request for %s'
%
name
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment