github/dokku
0
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

feat: validate app name when running git functions

Browse Source
This commit is contained in:
Jose Diaz-Gonzalez
2017-08-19 19:16:40 -04:00
parent 1a5bea6dde
commit ab11453fc8
2 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
plugins/git/functions
View File

@@ -105,8 +105,10 @@ git_hook_cmd() {
declare desc="kick off receive-app trigger from git prereceive hook" declare desc="kick off receive-app trigger from git prereceive hook"
local cmd="git-hook" local cmd="git-hook"
local APP="$2" local APP="$2"
local DOKKU_DEPLOY_BRANCH="$(git_deploy_branch "$APP")" local DOKKU_DEPLOY_BRANCH
is_valid_app_name "$APP"
DOKKU_DEPLOY_BRANCH="$(git_deploy_branch "$APP")"
if ! git check-ref-format --branch "$DOKKU_DEPLOY_BRANCH" > /dev/null 2>&1; then if ! git check-ref-format --branch "$DOKKU_DEPLOY_BRANCH" > /dev/null 2>&1; then
echo $'\e[1G\e[K'"-----> WARNING: Invalid branch name '$DOKKU_DEPLOY_BRANCH' specified via DOKKU_DEPLOY_BRANCH." echo $'\e[1G\e[K'"-----> WARNING: Invalid branch name '$DOKKU_DEPLOY_BRANCH' specified via DOKKU_DEPLOY_BRANCH."
echo $'\e[1G\e[K'"-----> For more details, please see the man page for 'git-check-ref-format.'" echo $'\e[1G\e[K'"-----> For more details, please see the man page for 'git-check-ref-format.'"
@@ -150,6 +152,7 @@ git_upload_pack_cmd() {
declare desc="executes git-upload-pack" declare desc="executes git-upload-pack"
local cmd="git-upload-pack" local cmd="git-upload-pack"
local APP="$(echo "$2" | perl -pe 's/(?<!\\)'\''//g' | sed 's/\\'\''/'\''/g')" local APP="$(echo "$2" | perl -pe 's/(?<!\\)'\''//g' | sed 's/\\'\''/'\''/g')"
is_valid_app_name "$APP"
plugn trigger git-pre-pull "$APP" plugn trigger git-pre-pull "$APP"
cat | git-upload-pack "$DOKKU_ROOT/$APP" cat | git-upload-pack "$DOKKU_ROOT/$APP"
plugn trigger git-post-pull "$APP" plugn trigger git-post-pull "$APP"
@@ -160,6 +163,7 @@ git_glob_cmd() {
local cmd="git-*" local cmd="git-*"
local APP="$(echo "$2" | perl -pe 's/(?<!\\)'\''//g' | sed 's/\\'\''/'\''/g' | sed 's/^\///g')" local APP="$(echo "$2" | perl -pe 's/(?<!\\)'\''//g' | sed 's/\\'\''/'\''/g' | sed 's/^\///g')"
local APP_PATH=$DOKKU_ROOT/$APP local APP_PATH=$DOKKU_ROOT/$APP
is_valid_app_name "$APP"
if [[ $1 == "git-receive-pack" && ! -d "$APP_PATH/refs" ]]; then if [[ $1 == "git-receive-pack" && ! -d "$APP_PATH/refs" ]]; then
git init --bare "$APP_PATH" > /dev/null git init --bare "$APP_PATH" > /dev/null

7
tests/unit/40_core_2.bats
View File

@@ -97,3 +97,10 @@ build_nginx_config() {
echo "status: "$status echo "status: "$status
assert_success assert_success
} }
@test "(core) git-remote (bad name)" {
run deploy_app nodejs-express ssh://dokku@127.0.0.1:22333/home/dokku/$TEST_APP
echo "output: "$output
echo "status: "$status
assert_failure
}