Commit c2bfe70f authored by Jérome Perrin's avatar Jérome Perrin

Resilience fixes and version ups

See merge request !1320
parents a729a677 15a65975
...@@ -62,7 +62,6 @@ scripts = ...@@ -62,7 +62,6 @@ scripts =
surykatka = 0.8.0 surykatka = 0.8.0
# For surykatka 0.7.1 # For surykatka 0.7.1
click = 8.0.1
dnspython = 2.1.0 dnspython = 2.1.0
forcediphttpsadapter = 1.0.1 forcediphttpsadapter = 1.0.1
miniupnpc = 2.0.2 miniupnpc = 2.0.2
......
...@@ -44,12 +44,3 @@ url = ${:_profile_base_location_}/${:_update_hash_filename_} ...@@ -44,12 +44,3 @@ url = ${:_profile_base_location_}/${:_update_hash_filename_}
[template-zones-file] [template-zones-file]
recipe = slapos.recipe.build:download recipe = slapos.recipe.build:download
url = ${:_profile_base_location_}/${:_update_hash_filename_} url = ${:_profile_base_location_}/${:_update_hash_filename_}
[versions]
PyRSS2Gen = 1.1
cns.recipe.symlink = 0.2.3
plone.recipe.command = 1.1
passlib = 1.7.1
GitPython = 2.1.11
feedparser = 5.2.1
atomize = 0.2.0
...@@ -220,10 +220,7 @@ validators = 0.12.2 ...@@ -220,10 +220,7 @@ validators = 0.12.2
PyRSS2Gen = 1.1 PyRSS2Gen = 1.1
cns.recipe.symlink = 0.2.3 cns.recipe.symlink = 0.2.3
ecdsa = 0.13 ecdsa = 0.13
gitdb = 0.6.4
plone.recipe.command = 1.1
pycrypto = 2.6.1 pycrypto = 2.6.1
smmap = 0.9.0
furl = 2.1.0 furl = 2.1.0
orderedmultidict = 1.0.1 orderedmultidict = 1.0.1
...@@ -146,8 +146,6 @@ scripts = ...@@ -146,8 +146,6 @@ scripts =
[versions] [versions]
Flask-Auth = 0.85 Flask-Auth = 0.85
futures = 3.0.5 futures = 3.0.5
gitdb = 0.6.4
gunicorn = 19.10.0 gunicorn = 19.10.0
prettytable = 0.7.2 prettytable = 0.7.2
pycurl = 7.43.0 pycurl = 7.43.0
smmap = 0.9.0
...@@ -18,7 +18,7 @@ md5sum = e24d0567cda7c72e39f6c8fcb0ede7ab ...@@ -18,7 +18,7 @@ md5sum = e24d0567cda7c72e39f6c8fcb0ede7ab
[pbsready-import] [pbsready-import]
filename = pbsready-import.cfg.in filename = pbsready-import.cfg.in
md5sum = 0aa7feb615fc5ac1a132a6d92c80f954 md5sum = da1d3229fe6d3664720d75b2e9d0b8f4
[pbsready-export] [pbsready-export]
filename = pbsready-export.cfg.in filename = pbsready-export.cfg.in
...@@ -46,7 +46,7 @@ md5sum = 2c9828b57a65ee1eda62fcc4e9a92714 ...@@ -46,7 +46,7 @@ md5sum = 2c9828b57a65ee1eda62fcc4e9a92714
[resilient-web-takeover-cgi-script-download] [resilient-web-takeover-cgi-script-download]
filename = resilient-web-takeover-cgi-script.py.in filename = resilient-web-takeover-cgi-script.py.in
md5sum = 4137b7ac6b20a6cd897ad58f51a763b1 md5sum = 8f5c9830f4865265d3477fe51425e71d
[template-wrapper] [template-wrapper]
filename = templates/wrapper.in filename = templates/wrapper.in
......
...@@ -105,7 +105,6 @@ takeover-triggered-file-path = $${resiliency-takeover-script:takeover-triggered- ...@@ -105,7 +105,6 @@ takeover-triggered-file-path = $${resiliency-takeover-script:takeover-triggered-
[resilient-web-takeover-password] [resilient-web-takeover-password]
recipe = slapos.cookbook:generate.password recipe = slapos.cookbook:generate.password
storage-path = $${directory:srv}/passwd storage-path = $${directory:srv}/passwd
bytes = 8
[resilient-web-takeover-cgi-script] [resilient-web-takeover-cgi-script]
recipe = collective.recipe.template recipe = collective.recipe.template
......
...@@ -7,8 +7,8 @@ takeover_script = '${resiliency-takeover-script:wrapper-takeover}' ...@@ -7,8 +7,8 @@ takeover_script = '${resiliency-takeover-script:wrapper-takeover}'
import atexit import atexit
import cgi import cgi
import cgitb
import datetime import datetime
import hmac
try: try:
import dbm.gnu as gdbm import dbm.gnu as gdbm
except ImportError: except ImportError:
...@@ -25,8 +25,6 @@ if os.path.exists('resilient_software_release_information.py'): ...@@ -25,8 +25,6 @@ if os.path.exists('resilient_software_release_information.py'):
else: else:
resilient_main = lambda: {} resilient_main = lambda: {}
cgitb.enable()
def deleteTemporaryDirectory(path): def deleteTemporaryDirectory(path):
if os.path.exists(path): if os.path.exists(path):
shutil.rmtree(path) shutil.rmtree(path)
...@@ -108,7 +106,7 @@ if "password" not in form: ...@@ -108,7 +106,7 @@ if "password" not in form:
</html>""" % (latest_backup_message, isBackupInProgress(), getSoftwareReleaseInformationFormatted())) </html>""" % (latest_backup_message, isBackupInProgress(), getSoftwareReleaseInformationFormatted()))
sys.exit(0) sys.exit(0)
if form['password'].value != '${:password}': if not hmac.compare_digest(form['password'].value.encode(), b'${:password}'):
print("<H1>Error</H1>") print("<H1>Error</H1>")
print("Password is invalid.") print("Password is invalid.")
sys.exit(1) sys.exit(1)
......
...@@ -152,7 +152,7 @@ backports.shutil-get-terminal-size = 1.0.0 ...@@ -152,7 +152,7 @@ backports.shutil-get-terminal-size = 1.0.0
bcrypt = 3.1.4 bcrypt = 3.1.4
bleach = 5.0.1 bleach = 5.0.1
CacheControl = 0.12.6:whl CacheControl = 0.12.6:whl
certifi = 2022.6.15 certifi = 2022.12.7
cffi = 1.15.0 cffi = 1.15.0
chardet = 3.0.4 chardet = 3.0.4
charset-normalizer = 2.1.1 charset-normalizer = 2.1.1
...@@ -184,8 +184,8 @@ funcsigs = 1.0.2 ...@@ -184,8 +184,8 @@ funcsigs = 1.0.2
functools32 = 3.2.3.post2 functools32 = 3.2.3.post2
gevent = 20.9.0 gevent = 20.9.0
geventmp = 0.0.1 geventmp = 0.0.1
gitdb2 = 2.0.5 gitdb = 4.0.10
GitPython = 2.1.11 GitPython = 3.1.30
greenlet = 0.4.17 greenlet = 0.4.17
h5py = 2.7.1 h5py = 2.7.1
h11 = 0.14.0 h11 = 0.14.0
...@@ -294,7 +294,7 @@ slapos.recipe.cmmi = 0.19 ...@@ -294,7 +294,7 @@ slapos.recipe.cmmi = 0.19
slapos.recipe.template = 5.0 slapos.recipe.template = 5.0
slapos.toolbox = 0.128 slapos.toolbox = 0.128
statsmodels = 0.11.1 statsmodels = 0.11.1
smmap2 = 2.0.5 smmap = 5.0.0
sniffio = 1.3.0 sniffio = 1.3.0
sortedcontainers = 2.4.0 sortedcontainers = 2.4.0
stevedore = 1.21.0:whl stevedore = 1.21.0:whl
...@@ -314,7 +314,7 @@ urllib3 = 1.26.12 ...@@ -314,7 +314,7 @@ urllib3 = 1.26.12
wcwidth = 0.2.5 wcwidth = 0.2.5
webencodings = 0.5.1 webencodings = 0.5.1
Werkzeug = 2.0.2 Werkzeug = 2.0.2
wheel = 0.35.1:whl wheel = 0.38.4:whl
widgetsnbextension = 2.0.0 widgetsnbextension = 2.0.0
wsproto = 1.2.0 wsproto = 1.2.0
xml-marshaller = 1.0.2 xml-marshaller = 1.0.2
...@@ -335,11 +335,16 @@ charset-normalizer = 2.0.12 ...@@ -335,11 +335,16 @@ charset-normalizer = 2.0.12
click = 6.7 click = 6.7
distro = 1.6.0 distro = 1.6.0
feedparser = 5.2.1 feedparser = 5.2.1
gitdb2 = 2.0.5
GitPython = 2.1.11
pyparsing = 2.2.0 pyparsing = 2.2.0
pyrsistent = 0.16.1 pyrsistent = 0.16.1
requests = 2.27.1 requests = 2.27.1
smmap = 0.9.0
smmap2 = 2.0.5
traitlets = 4.3.3 traitlets = 4.3.3
Werkzeug = 1.0.1 Werkzeug = 1.0.1
wheel = 0.35.1:whl
[versions:sys.version_info < (3,8)] [versions:sys.version_info < (3,8)]
MarkupSafe = 1.0 MarkupSafe = 1.0
......
Markdown is supported
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