Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
I
Imldeployment Client
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
IML Open Source
Imldeployment Client
Commits
3010c2fb
Commit
3010c2fb
authored
2 years ago
by
Hahn Axel (hahn)
Browse files
Options
Downloads
Plain Diff
Merge branch '6141-update-for-openssl3' into 'master'
compatibilty to openssl v3 See merge request
!7
parents
cc3cb1b8
133da06d
Branches
Branches containing commit
No related tags found
1 merge request
!7
compatibilty to openssl v3
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
bin/getfile.sh
+6
-5
6 additions, 5 deletions
bin/getfile.sh
deploy_app.sh
+2
-1
2 additions, 1 deletion
deploy_app.sh
with
8 additions
and
6 deletions
bin/getfile.sh
+
6
−
5
View file @
3010c2fb
...
...
@@ -9,13 +9,14 @@
# 2021-04-13 v1.1 <axel.hahn@iml.unibe.ch> add support for custom config
# 2021-04-15 v1.2 <axel.hahn@iml.unibe.ch> added debugging of curl request
# 2021-10-14 v1.3 <axel.hahn@iml.unibe.ch> add nanoseconds in hashed base data
# 2023-02-14 v1.4 <axel.hahn@unibe.ch> compatibility to openssl v3
# ======================================================================
# ----------------------------------------------------------------------
# CONFIG
# ----------------------------------------------------------------------
version
=
"v1.3"
version
=
"v1.
4
3"
about
=
"CI PACKAGE GETTER
$version
;
(c) 2021 Institute for Medical Education (IML); University of Bern;
GNU GPL 3.0"
...
...
@@ -123,7 +124,7 @@ function makeRequest(){
if
[
$bDebug
=
1
]
;
then
echo
$line
echo
$apiMethod
${
apiHost
}${
apiRequest
}
echo
"
$apiMethod
${
apiHost
}${
apiRequest
}
"
echo
$line
fi
...
...
@@ -132,7 +133,7 @@ function makeRequest(){
# --- date in http format
LANG
=
en_EN
# export TZ=GMT
apiTS
=
`
date
"+%a, %d %b %Y %H:%M:%S.%N %Z"
`
apiTS
=
$(
date
"+%a, %d %b %Y %H:%M:%S.%N %Z"
)
# --- generate data to hash: method + uri + timestamp; delimited with line break
...
...
@@ -147,8 +148,8 @@ ${apiTS}
fi
# generate hash - split in 2 commands (piping "cut" sends additional line break)
myHash
=
`
echo
-n
"
$data
"
| openssl sha1
-hmac
"
${
secret
}
"
|
cut
-f
2
-d
" "
`
myHash
=
`
echo
-n
"
$myHash
"
|
base64
`
myHash
=
$(
echo
-n
"
$data
"
| openssl
dgst
-
sha1
-hex
-hmac
"
${
secret
}
"
|
cut
-f
2
-d
" "
)
myHash
=
$(
echo
-n
"
$myHash
"
|
base64
)
moreheaders
=
"--fail"
test
$bDebug
=
1
&&
moreheaders
=
"-i"
...
...
This diff is collapsed.
Click to expand it.
deploy_app.sh
+
2
−
1
View file @
3010c2fb
...
...
@@ -13,6 +13,7 @@
# 2021-11-02 v0.7 <axel.hahn@iml.unibe.ch> delete logs keping N files
# 2022-11-24 v0.8 <axel.hahn@iml.unibe.ch> tar -xzf without dot as 2nd param
# 2022-11-25 v0.9 <axel.hahn@iml.unibe.ch> support custom phase + file per project
# 2023-02-14 v1.0 <axel.hahn@unibe.ch> set v1.0 (no changes)
# ======================================================================
...
...
@@ -21,7 +22,7 @@
# ----------------------------------------------------------------------
cd
$(
dirname
$0
)
selfdir
=
$(
/bin/pwd
)
_version
=
0.9
_version
=
1.0
tmpdir
=
/var/tmp/imldeployment_packages
logdir
=
/var/log/imldeployment-client
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment