github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-30 23:15:14 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #31318 from adityakali/gci53

Browse Source 
Automatic merge from submit-queue

Add validation for KUBE_USER

Malformed KUBE_USER causes error in cluster setup.

cc/ @kubernetes/goog-image 
@Q-Lee @Amey-D  Can you please review?
This commit is contained in:
Kubernetes Submit Queue 2016-08-24 22:18:39 -07:00 committed by GitHub
commit 38d3decdfb
2 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
cluster/common.sh
View File

@ -257,6 +257,16 @@ function load-or-gen-kube-basicauth() {
if [[ -z "${KUBE_USER:-}" || -z "${KUBE_PASSWORD:-}" ]]; then if [[ -z "${KUBE_USER:-}" || -z "${KUBE_PASSWORD:-}" ]]; then
gen-kube-basicauth gen-kube-basicauth
fi fi
# Make sure they don't contain any funny characters.
if ! [[ "${KUBE_USER}" =~ ^[-._@a-zA-Z0-9]+$ ]]; then
echo "Bad KUBE_USER string."
exit 1
fi
if ! [[ "${KUBE_PASSWORD}" =~ ^[-._@#%/a-zA-Z0-9]+$ ]]; then
echo "Bad KUBE_PASSWORD string."
exit 1
fi
} }
function load-or-gen-kube-bearertoken() { function load-or-gen-kube-bearertoken() {

10
cluster/gce/gci/configure-helper.sh
View File

@ -755,7 +755,7 @@ function start-kube-apiserver {
if [[ -n "${KUBE_USER:-}" ]]; then if [[ -n "${KUBE_USER:-}" ]]; then
local -r abac_policy_json="${src_dir}/abac-authz-policy.jsonl" local -r abac_policy_json="${src_dir}/abac-authz-policy.jsonl"
remove-salt-config-comments "${abac_policy_json}" remove-salt-config-comments "${abac_policy_json}"
sed -i -e "s@{{kube_user}}@${KUBE_USER}@g" "${abac_policy_json}" sed -i -e "s/{{kube_user}}/${KUBE_USER}/g" "${abac_policy_json}"
cp "${abac_policy_json}" /etc/srv/kubernetes/ cp "${abac_policy_json}" /etc/srv/kubernetes/
fi fi
@ -1115,6 +1115,14 @@ if [[ ! -e "${KUBE_HOME}/kube-env" ]]; then
fi fi
source "${KUBE_HOME}/kube-env" source "${KUBE_HOME}/kube-env"
if [[ -n "${KUBE_USER:-}" ]]; then
if ! [[ "${KUBE_USER}" =~ ^[-._@a-zA-Z0-9]+$ ]]; then
echo "Bad KUBE_USER format."
exit 1
fi
fi
config-ip-firewall config-ip-firewall
create-dirs create-dirs
ensure-local-ssds ensure-local-ssds