Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
ruanhaishen
Acme.Sh
Commits
6cb5377d
Commit
6cb5377d
authored
Aug 31, 2017
by
Manuel Friedli
Browse files
Fix bugs and more/new formatting errors.
parent
a3a92ff1
Changes
1
Hide whitespace changes
Inline
Side-by-side
deploy/fritzbox.sh
View file @
6cb5377d
...
@@ -63,7 +63,7 @@ fritzbox_deploy() {
...
@@ -63,7 +63,7 @@ fritzbox_deploy() {
_info
"Log in to the FRITZ!Box"
_info
"Log in to the FRITZ!Box"
_fritzbox_challenge
=
"
$(
wget
--no-check-certificate
-q
-O
-
"
${
_fritzbox_url
}
/login_sid.lua"
|
sed
-e
's/^.*<Challenge>//'
-e
's/<\/Challenge>.*$//'
)
"
_fritzbox_challenge
=
"
$(
wget
--no-check-certificate
-q
-O
-
"
${
_fritzbox_url
}
/login_sid.lua"
|
sed
-e
's/^.*<Challenge>//'
-e
's/<\/Challenge>.*$//'
)
"
_fritzbox_hash
=
"
$(
echo
-n
"
${
_fritzbox_challenge
}
-
${
_fritzbox_password
}
"
| iconv
-f
ASCII
-t
UTF16LE |
md5sum
|
awk
'{print $1}'
)
"
_fritzbox_hash
=
"
$(
echo
-n
"
${
_fritzbox_challenge
}
-
${
_fritzbox_password
}
"
| iconv
-f
ASCII
-t
UTF16LE |
md5sum
|
awk
'{print $1}'
)
"
_fritzbox_sid
=
"
$(
wget
--no-check-certificate
-q
-O
-
"
${
_fritzbox_url
}
/login_sid.lua?sid=0000000000000000
\
&
username=
${
_fritzbox_username
}
\
&
response=
${
_fritzbox_challenge
}
-
${
_fritzbox_hash
}
"
|
sed
-e
's/^.*<SID>//'
-e
's/<\/SID>.*$//'
)
"
_fritzbox_sid
=
"
$(
wget
--no-check-certificate
-q
-O
-
"
${
_fritzbox_url
}
/login_sid.lua?sid=0000000000000000&username=
${
_fritzbox_username
}
&response=
${
_fritzbox_challenge
}
-
${
_fritzbox_hash
}
"
|
sed
-e
's/^.*<SID>//'
-e
's/<\/SID>.*$//'
)
"
if
[
-z
"
${
_fritzbox_sid
}
"
]
||
[
"
${
_fritzbox_sid
}
"
=
"0000000000000000"
]
;
then
if
[
-z
"
${
_fritzbox_sid
}
"
]
||
[
"
${
_fritzbox_sid
}
"
=
"0000000000000000"
]
;
then
_err
"Logging in to the FRITZ!Box failed. Please check username, password and URL."
_err
"Logging in to the FRITZ!Box failed. Please check username, password and URL."
...
@@ -74,22 +74,22 @@ fritzbox_deploy() {
...
@@ -74,22 +74,22 @@ fritzbox_deploy() {
_post_request
=
"
$(
_mktemp
)
"
_post_request
=
"
$(
_mktemp
)
"
_post_boundary
=
"---------------------------
$(
date
+%Y%m%d%H%M%S
)
"
_post_boundary
=
"---------------------------
$(
date
+%Y%m%d%H%M%S
)
"
{
{
printf
--
"--%s
\r\n
"
"
${
_post_boundary
}
"
;
printf
--
"--%s
\r\n
"
"
${
_post_boundary
}
"
printf
"Content-Disposition: form-data; name=
\"
sid
\"\r\n\r\n
%s
\r\n
"
"
${
_fritzbox_sid
}
"
;
printf
"Content-Disposition: form-data; name=
\"
sid
\"\r\n\r\n
%s
\r\n
"
"
${
_fritzbox_sid
}
"
printf
--
"--%s
\r\n
""
${
_post_boundary
}
"
;
printf
--
"--%s
\r\n
"
"
${
_post_boundary
}
"
}
>>
"
${
_post_request
}
"
}
>>
"
${
_post_request
}
"
# _CERTPASSWORD_ is unset because Let's Encrypt certificates don't have a passwort. But if they ever do, here's the place to use it!
# _CERTPASSWORD_ is unset because Let's Encrypt certificates don't have a passwort. But if they ever do, here's the place to use it!
_CERTPASSWORD_
=
_CERTPASSWORD_
=
{
{
printf
"Content-Disposition: form-data; name=
\"
BoxCertPassword
\"\r\n\r\n
%s
\r\n
"
"
${
_CERTPASSWORD_
}
"
;
printf
"Content-Disposition: form-data; name=
\"
BoxCertPassword
\"\r\n\r\n
%s
\r\n
"
"
${
_CERTPASSWORD_
}
"
printf
--
"--%s
\r\n
"
"
${
_post_boundary
}
"
;
printf
--
"--%s
\r\n
"
"
${
_post_boundary
}
"
printf
"Content-Disposition: form-data; name=
\"
BoxCertImportFile
\"
; filename=
\"
BoxCert.pem
\"\r\n
"
;
printf
"Content-Disposition: form-data; name=
\"
BoxCertImportFile
\"
; filename=
\"
BoxCert.pem
\"\r\n
"
printf
"Content-Type: application/octet-stream
\r\n\r\n
"
;
printf
"Content-Type: application/octet-stream
\r\n\r\n
"
}
>>
"
${
_post_request
}
"
}
>>
"
${
_post_request
}
"
cat
"
${
_ckey
}${
_cfullchain
}
"
>>
"
${
_post_request
}
"
cat
"
${
_ckey
}
"
"
${
_cfullchain
}
"
>>
"
${
_post_request
}
"
{
{
printf
"
\r\n
"
;
printf
"
\r\n
"
printf
--
"--%s--"
"
${
_post_boundary
}
"
;
printf
--
"--%s--"
"
${
_post_boundary
}
"
}
>>
"
${
_post_request
}
"
}
>>
"
${
_post_request
}
"
_info
"Upload certificate to the FRITZ!Box"
_info
"Upload certificate to the FRITZ!Box"
...
...
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