Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
slapos
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
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Tristan Cavelier
slapos
Commits
57707289
Commit
57707289
authored
Mar 16, 2017
by
Sebastien Robin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
erp5testnode: make shellinabox reusing password file of pwgen
parent
bb2c875c
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
20 additions
and
14 deletions
+20
-14
slapos/recipe/shellinabox.py
slapos/recipe/shellinabox.py
+18
-12
software/erp5testnode/instance-default.cfg
software/erp5testnode/instance-default.cfg
+1
-1
software/erp5testnode/software.cfg
software/erp5testnode/software.cfg
+1
-1
No files found.
slapos/recipe/shellinabox.py
View file @
57707289
...
@@ -25,6 +25,7 @@
...
@@ -25,6 +25,7 @@
#
#
##############################################################################
##############################################################################
from
getpass
import
getpass
from
getpass
import
getpass
import
hmac
import
pwd
import
pwd
import
grp
import
grp
import
os
import
os
...
@@ -33,19 +34,24 @@ import shlex
...
@@ -33,19 +34,24 @@ import shlex
from
slapos.recipe.librecipe
import
GenericBaseRecipe
from
slapos.recipe.librecipe
import
GenericBaseRecipe
def
login_shell
(
args
):
def
login_shell
(
args
):
password
=
args
[
'password'
]
password_file
=
args
[
'password-file'
]
if
password_file
:
if
(
password
!=
''
):
with
open
(
password_file
,
'r'
)
as
password_file
:
entered_password
=
getpass
()
password
=
password_file
.
read
()
else
:
entered_password
=
''
if
entered_password
!=
password
:
if
(
password
!=
''
):
return
1
entered_password
=
getpass
()
else
:
entered_password
=
''
if
not
hmac
.
compare_digest
(
entered_password
,
password
):
return
1
else
:
commandline
=
shlex
.
split
(
args
[
'shell'
])
path
=
commandline
[
0
]
os
.
execv
(
path
,
commandline
)
else
:
else
:
commandline
=
shlex
.
split
(
args
[
'shell'
])
return
1
path
=
commandline
[
0
]
os
.
execv
(
path
,
commandline
)
def
shellinabox
(
args
):
def
shellinabox
(
args
):
certificate_dir
=
args
[
'certificate_dir'
]
certificate_dir
=
args
[
'certificate_dir'
]
...
@@ -95,7 +101,7 @@ class Recipe(GenericBaseRecipe):
...
@@ -95,7 +101,7 @@ class Recipe(GenericBaseRecipe):
self
.
options
[
'login-shell'
],
self
.
options
[
'login-shell'
],
'%s.login_shell'
%
__name__
,
'%s.login_shell'
%
__name__
,
{
{
'password
'
:
self
.
options
[
'password
'
],
'password
-file'
:
self
.
options
[
'password-file
'
],
'shell'
:
self
.
options
[
'shell'
]
'shell'
:
self
.
options
[
'shell'
]
}
}
)
)
...
...
software/erp5testnode/instance-default.cfg
View file @
57707289
...
@@ -94,7 +94,7 @@ port = 8080
...
@@ -94,7 +94,7 @@ port = 8080
shell = $${shell:wrapper}
shell = $${shell:wrapper}
wrapper = $${rootdirectory:bin}/shellinaboxd
wrapper = $${rootdirectory:bin}/shellinaboxd
shellinabox-binary = ${shellinabox:location}/bin/shellinaboxd
shellinabox-binary = ${shellinabox:location}/bin/shellinaboxd
password
= $${pwgen:passwd
}
password
-file = $${pwgen:storage-path
}
directory = $${buildout:directory}/
directory = $${buildout:directory}/
login-shell = $${rootdirectory:bin}/login
login-shell = $${rootdirectory:bin}/login
certificate-directory = $${directory:shellinabox}
certificate-directory = $${directory:shellinabox}
...
...
software/erp5testnode/software.cfg
View file @
57707289
...
@@ -56,7 +56,7 @@ recipe = slapos.recipe.template
...
@@ -56,7 +56,7 @@ recipe = slapos.recipe.template
url = ${:_profile_base_location_}/instance-default.cfg
url = ${:_profile_base_location_}/instance-default.cfg
output = ${buildout:directory}/template-default.cfg
output = ${buildout:directory}/template-default.cfg
mode = 0644
mode = 0644
md5sum =
8e171816b6caef52ac75c2f8f6a69fc3
md5sum =
05519f3887a309d3ec069e0aa9f52ebc
[versions]
[versions]
PyXML = 0.8.5
PyXML = 0.8.5
...
...
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