Alex-Devera/3x-ui
1
0
Fork 0
mirror of https://github.com/MHSanaei/3x-ui.git synced 2026-06-05 12:44:22 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

feat(x-ui.sh): support Cloudflare API Token for DNS SSL (menu 20) (#4595)

Browse source 
Menu 20 only exported CF_Key/CF_Email, so a restricted Cloudflare API Token was misread as a Global Key and acme.sh failed with 'invalid domain'. Add a token-or-global-key prompt (default token): an API Token exports CF_Token, the Global Key keeps the previous CF_Key + CF_Email behavior. Also stop echoing the key/token value to the debug log.
This commit is contained in:
MHSanaei 2026-06-02 00:22:12 +02:00
parent 49bec1db0f
commit cb17eb8c06
No known key found for this signature in database
GPG key ID: 7E4060F2FBE5AB7A
1 changed files with 25 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
x-ui.sh
View file

@ -1600,11 +1600,10 @@ ssl_cert_issue_CF() {
local existing_port=$(${xui_folder}/x-ui setting -show true | grep -Eo 'port: .+' | awk '{print $2}') local existing_port=$(${xui_folder}/x-ui setting -show true | grep -Eo 'port: .+' | awk '{print $2}')
LOGI "****** Instructions for Use ******" LOGI "****** Instructions for Use ******"
LOGI "Follow the steps below to complete the process:" LOGI "Follow the steps below to complete the process:"
LOGI "1. Cloudflare Registered E-mail." LOGI "1. A Cloudflare API Token (recommended, scoped to Zone:DNS:Edit) or the Global API Key + registered email."
LOGI "2. Cloudflare Global API Key." LOGI "2. The Domain Name."
LOGI "3. The Domain Name." LOGI "3. Once the certificate is issued, you will be prompted to set the certificate for the panel (optional)."
LOGI "4. Once the certificate is issued, you will be prompted to set the certificate for the panel (optional)." LOGI "4. The script also supports automatic renewal of the SSL certificate after installation."
LOGI "5. The script also supports automatic renewal of the SSL certificate after installation."
confirm "Do you confirm the information and wish to proceed? [y/n]" "y" confirm "Do you confirm the information and wish to proceed? [y/n]" "y"
@ -1625,16 +1624,28 @@ ssl_cert_issue_CF() {
read -rp "Input your domain here: " CF_Domain read -rp "Input your domain here: " CF_Domain
LOGD "Your domain name is set to: ${CF_Domain}" LOGD "Your domain name is set to: ${CF_Domain}"
# Set up Cloudflare API details # Cloudflare API credentials: an API Token (recommended, scoped to a
CF_GlobalKey="" # single zone) or the account-wide Global API Key. acme.sh reads
CF_AccountEmail="" # CF_Token for tokens, or CF_Key + CF_Email for the Global Key.
LOGD "Please set the API key:" CF_KeyType=""
read -rp "Input your key here: " CF_GlobalKey read -rp "Are you using a Cloudflare API Token or Global API Key? (t/g) [Default t]: " CF_KeyType
LOGD "Your API key is: ${CF_GlobalKey}" CF_KeyType=${CF_KeyType:-t}
LOGD "Please set up registered email:" if [[ "$CF_KeyType" == "g" || "$CF_KeyType" == "G" ]]; then
read -rp "Input your email here: " CF_AccountEmail CF_GlobalKey=""
LOGD "Your registered email address is: ${CF_AccountEmail}" CF_AccountEmail=""
LOGD "Please set the Global API Key:"
read -rp "Input your key here: " CF_GlobalKey
LOGD "Please set up the registered email:"
read -rp "Input your email here: " CF_AccountEmail
export CF_Key="${CF_GlobalKey}"
export CF_Email="${CF_AccountEmail}"
else
CF_ApiToken=""
LOGD "Please set the API Token:"
read -rp "Input your token here: " CF_ApiToken
export CF_Token="${CF_ApiToken}"
fi
# Set the default CA to Let's Encrypt # Set the default CA to Let's Encrypt
~/.acme.sh/acme.sh --set-default-ca --server letsencrypt --force ~/.acme.sh/acme.sh --set-default-ca --server letsencrypt --force
@ -1643,9 +1654,6 @@ ssl_cert_issue_CF() {
exit 1 exit 1
fi fi
export CF_Key="${CF_GlobalKey}"
export CF_Email="${CF_AccountEmail}"
# Issue the certificate using Cloudflare DNS # Issue the certificate using Cloudflare DNS
~/.acme.sh/acme.sh --issue --dns dns_cf -d ${CF_Domain} -d *.${CF_Domain} --log --force ~/.acme.sh/acme.sh --issue --dns dns_cf -d ${CF_Domain} -d *.${CF_Domain} --log --force
if [ $? -ne 0 ]; then if [ $? -ne 0 ]; then