curben
/
cloudflared-mirror
mirror of https://github.com/cloudflare/cloudflared.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

AUTH-2653 disabling signing until we can get the keys

This commit is contained in:
Dalton 2020-08-19 12:08:07 -05:00
parent 310bd0dbf1
commit edb980d439
1 changed files with 60 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

115
.teamcity/build-macos.sh vendored
View File

@ -28,69 +28,72 @@ cp -r . ../src/github.com/cloudflare/cloudflared
cd ../src/github.com/cloudflare/cloudflared cd ../src/github.com/cloudflare/cloudflared
GOCACHE="$PWD/../../../../" GOPATH="$PWD/../../../../" CGO_ENABLED=1 make cloudflared GOCACHE="$PWD/../../../../" GOPATH="$PWD/../../../../" CGO_ENABLED=1 make cloudflared
# Add code signing private key to the key chain # TODO: AUTH-2653 - The CFD_CODE_SIGN_KEY and CFD_INSTALLER_KEY are "doubly" gpg encrypted.
if [[ -n "${CFD_CODE_SIGN_KEY:-}" ]]; then # this needs to be fixed, but I don't have access to the keys to do it.
if [[ -n "${CFD_CODE_SIGN_PASS:-}" ]]; then # The private keys are on from Dane's laptop
# write private key to disk and then import it keychain
echo -n -e ${CFD_CODE_SIGN_KEY} | base64 -D > ${CODE_SIGN_PRIV}
security import ${CODE_SIGN_PRIV} -A -P "${CFD_CODE_SIGN_PASS}"
rm ${CODE_SIGN_PRIV}
fi
fi
# Add code signing certificate to the key chain # # Add code signing private key to the key chain
if [[ -n "${CFD_CODE_SIGN_CERT:-}" ]]; then # if [[ -n "${CFD_CODE_SIGN_KEY:-}" ]]; then
# write certificate to disk and then import it keychain # if [[ -n "${CFD_CODE_SIGN_PASS:-}" ]]; then
echo -n -e ${CFD_CODE_SIGN_CERT} | base64 -D > ${CODE_SIGN_CERT} # # write private key to disk and then import it keychain
security import ${CODE_SIGN_CERT} # echo -n -e ${CFD_CODE_SIGN_KEY} | base64 -D > ${CODE_SIGN_PRIV}
rm ${CODE_SIGN_CERT} # security import ${CODE_SIGN_PRIV} -A -P "${CFD_CODE_SIGN_PASS}"
fi # rm ${CODE_SIGN_PRIV}
# fi
# fi
# Add package signing private key to the key chain # # Add code signing certificate to the key chain
if [[ -n "${CFD_INSTALLER_KEY:-}" ]]; then # if [[ -n "${CFD_CODE_SIGN_CERT:-}" ]]; then
if [[ -n "${CFD_INSTALLER_PASS:-}" ]]; then # # write certificate to disk and then import it keychain
# write private key to disk and then import it into the keychain # echo -n -e ${CFD_CODE_SIGN_CERT} | base64 -D > ${CODE_SIGN_CERT}
echo -n -e ${CFD_INSTALLER_KEY} | base64 -D > ${INSTALLER_PRIV} # security import ${CODE_SIGN_CERT}
security import ${INSTALLER_PRIV} -A -P "${CFD_INSTALLER_PASS}" # rm ${CODE_SIGN_CERT}
rm ${INSTALLER_PRIV} # fi
fi
fi
# Add package signing certificate to the key chain # # Add package signing private key to the key chain
if [[ -n "${CFD_INSTALLER_CERT:-}" ]]; then # if [[ -n "${CFD_INSTALLER_KEY:-}" ]]; then
# write certificate to disk and then import it keychain # if [[ -n "${CFD_INSTALLER_PASS:-}" ]]; then
echo -n -e ${CFD_INSTALLER_CERT} | base64 -D > ${INSTALLER_CERT} # # write private key to disk and then import it into the keychain
security import ${INSTALLER_CERT} # echo -n -e ${CFD_INSTALLER_KEY} | base64 -D > ${INSTALLER_PRIV}
rm ${INSTALLER_CERT} # security import ${INSTALLER_PRIV} -A -P "${CFD_INSTALLER_PASS}"
fi # rm ${INSTALLER_PRIV}
# fi
# fi
# get the code signing certificate name # # Add package signing certificate to the key chain
if [[ -n "${CFD_CODE_SIGN_NAME:-}" ]]; then # if [[ -n "${CFD_INSTALLER_CERT:-}" ]]; then
CODE_SIGN_NAME="${CFD_CODE_SIGN_NAME}" # # write certificate to disk and then import it keychain
else # echo -n -e ${CFD_INSTALLER_CERT} | base64 -D > ${INSTALLER_CERT}
if [[ -n "$(security find-identity -v | cut -d'"' -f 2 -s | grep "Developer ID Application:")" ]]; then # security import ${INSTALLER_CERT}
CODE_SIGN_NAME=$(echo "something else" | grep "Developer ID Application:") # rm ${INSTALLER_CERT}
else # fi
CODE_SIGN_NAME=""
fi
fi
# get the package signing certificate name # # get the code signing certificate name
if [[ -n "${CFD_INSTALLER_NAME:-}" ]]; then # if [[ -n "${CFD_CODE_SIGN_NAME:-}" ]]; then
PKG_SIGN_NAME="${CFD_INSTALLER_NAME}" # CODE_SIGN_NAME="${CFD_CODE_SIGN_NAME}"
else # else
if [[ -n "$(security find-identity -v | cut -d'"' -f 2 -s | grep "Developer ID Installer:")" ]]; then # if [[ -n "$(security find-identity -v | cut -d'"' -f 2 -s | grep "Developer ID Application:")" ]]; then
PKG_SIGN_NAME=$(security find-identity -v | cut -d'"' -f 2 -s | grep "Developer ID Installer:") # CODE_SIGN_NAME=$(security find-identity -v | cut -d'"' -f 2 -s | grep "Developer ID Application:")
else # else
PKG_SIGN_NAME="" # CODE_SIGN_NAME=""
fi # fi
# fi
fi # # get the package signing certificate name
# if [[ -n "${CFD_INSTALLER_NAME:-}" ]]; then
# PKG_SIGN_NAME="${CFD_INSTALLER_NAME}"
# else
# if [[ -n "$(security find-identity -v | cut -d'"' -f 2 -s | grep "Developer ID Installer:")" ]]; then
# PKG_SIGN_NAME=$(security find-identity -v | cut -d'"' -f 2 -s | grep "Developer ID Installer:")
# else
# PKG_SIGN_NAME=""
# fi
# fi
# sign the cloudflared binary # # sign the cloudflared binary
if [[ -n "${CODE_SIGN_NAME:-}" ]]; then # if [[ -n "${CODE_SIGN_NAME:-}" ]]; then
codesign -s "${CODE_SIGN_NAME}" -f -v --timestamp --options runtime ${BINARY_NAME} # codesign -s "${CODE_SIGN_NAME}" -f -v --timestamp --options runtime ${BINARY_NAME}
fi # fi
# creating build directory # creating build directory