Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
S
slapos.core
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
slapos.core
Commits
1d4873b7
Commit
1d4873b7
authored
Sep 10, 2012
by
Cédric Le Ninivin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fixed problem with login in register
parent
3e48b13d
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
5 deletions
+5
-5
slapos/register/register.py
slapos/register/register.py
+5
-5
No files found.
slapos/register/register.py
View file @
1d4873b7
...
@@ -292,14 +292,14 @@ def register(config):
...
@@ -292,14 +292,14 @@ def register(config):
user_id
=
get_login
()
user_id
=
get_login
()
if
check_login
(
user_id
,
config
.
master_url_web
):
break
if
check_login
(
user_id
,
config
.
master_url_web
):
break
config
.
logger
.
warning
(
"Wrong login/password"
)
config
.
logger
.
warning
(
"Wrong login/password"
)
elif
config
.
password
==
None
:
if
not
check_login
(
base64
.
encodestring
(
'%s:%s'
%
(
config
.
login
,
getpass
()))[:
-
1
],
config
.
master_url_web
):
config
.
logger
.
error
(
"Wrong login/password"
)
return
1
else
:
else
:
if
not
check_login
(
base64
.
encodestring
(
'%s:%s'
%
(
config
.
login
,
config
.
password
))[:
-
1
],
config
.
master_url_web
):
if
config
.
password
==
None
:
config
.
password
=
getpass
()
user_id
=
base64
.
encodestring
(
'%s:%s'
%
(
config
.
login
,
config
.
password
))[:
-
1
]
if
not
check_login
(
user_id
,
config
.
master_url_web
):
config
.
logger
.
error
(
"Wrong login/password"
)
config
.
logger
.
error
(
"Wrong login/password"
)
return
1
return
1
# Get source code of page having certificate and key
# Get source code of page having certificate and key
certificate_key
=
get_certificates
(
user_id
,
config
.
node_name
,
config
.
master_url_web
)
certificate_key
=
get_certificates
(
user_id
,
config
.
node_name
,
config
.
master_url_web
)
# Parse certificate and key and get computer id
# Parse certificate and key and get computer id
...
...
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