mirror of
				https://github.com/hiskang/acme.sh
				synced 2025-10-31 18:37:30 +00:00 
			
		
		
		
	Don't use wget directly, but instead use _get and _post.
This commit is contained in:
		
							parent
							
								
									a098167bdb
								
							
						
					
					
						commit
						bd8b1a2501
					
				| @ -27,10 +27,6 @@ fritzbox_deploy() { | |||||||
|   _debug _cca "$_cca" |   _debug _cca "$_cca" | ||||||
|   _debug _cfullchain "$_cfullchain" |   _debug _cfullchain "$_cfullchain" | ||||||
| 
 | 
 | ||||||
|   if ! _exists wget; then |  | ||||||
|     _err "wget not found" |  | ||||||
|     return 1 |  | ||||||
|   fi |  | ||||||
|   if ! _exists iconv; then |   if ! _exists iconv; then | ||||||
|     _err "iconv not found" |     _err "iconv not found" | ||||||
|     return 1 |     return 1 | ||||||
| @ -60,10 +56,13 @@ fritzbox_deploy() { | |||||||
|   _saveaccountconf DEPLOY_FRITZBOX_PASSWORD "${_fritzbox_password}" |   _saveaccountconf DEPLOY_FRITZBOX_PASSWORD "${_fritzbox_password}" | ||||||
|   _saveaccountconf DEPLOY_FRITZBOX_URL "${_fritzbox_url}" |   _saveaccountconf DEPLOY_FRITZBOX_URL "${_fritzbox_url}" | ||||||
| 
 | 
 | ||||||
|  |   # Do not check for a valid SSL certificate, because initially the cert is not valid, so it could not install the LE generated certificate | ||||||
|  |   export HTTPS_INSECURE=1 | ||||||
|  | 
 | ||||||
|   _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="$(_get "${_fritzbox_url}/login_sid.lua" | sed -e 's/^.*<Challenge>//' -e 's/<\/Challenge>.*$//')" | ||||||
|   _fritzbox_hash="$(printf "%s-%s" "${_fritzbox_challenge}" "${_fritzbox_password}" | iconv -f ASCII -t UTF16LE | md5sum | awk '{print $1}')" |   _fritzbox_hash="$(printf "%s-%s" "${_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="$(_get "${_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." | ||||||
| @ -91,10 +90,17 @@ fritzbox_deploy() { | |||||||
|   } >>"${_post_request}" |   } >>"${_post_request}" | ||||||
| 
 | 
 | ||||||
|   _info "Upload certificate to the FRITZ!Box" |   _info "Upload certificate to the FRITZ!Box" | ||||||
|   wget --no-check-certificate -q -O - "${_fritzbox_url}/cgi-bin/firmwarecfg" --header="Content-type: multipart/form-data boundary=${_post_boundary}" --post-file "${_post_request}" | grep SSL |  | ||||||
| 
 | 
 | ||||||
|  |   export _H1="Content-type: multipart/form-data boundary=${_post_boundary}" | ||||||
|  |   _post "$(cat ${_post_request})" "${_fritzbox_url}/cgi-bin/firmwarecfg" | grep SSL | ||||||
|  | 
 | ||||||
|  |   retval=$? | ||||||
|  |   if [ $retval = 0 ] ; then | ||||||
|     _info "Upload successful" |     _info "Upload successful" | ||||||
|  |   else | ||||||
|  |     _err "Upload failed" | ||||||
|  |   fi | ||||||
|   rm "${_post_request}" |   rm "${_post_request}" | ||||||
| 
 | 
 | ||||||
|   return 0 |   return $retval | ||||||
| } | } | ||||||
|  | |||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user