Mirrors/dokku
1
0
Fork 0
mirror of https://github.com/dokku/dokku.git synced 2025-12-29 00:25:08 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6801 from dokku/6764-invalid-proxy

Browse Source 
Guard against invalid proxy values due to move of port mapping to ports plugin
This commit is contained in:
Jose Diaz-Gonzalez
2024-04-05 00:25:40 -04:00
committed by GitHub
parent 5ecfa7e532 1909fa7fdf
commit 0b2ee9c905
2 changed files with 14 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
plugins/proxy/subcommands.go
View File

@@ -2,6 +2,7 @@ package proxy
import (
"errors"
"strings"
"github.com/dokku/dokku/plugins/common"
"github.com/dokku/dokku/plugins/config"
@@ -89,6 +90,11 @@ func CommandSet(appName string, proxyType string) error {
return errors.New("Please specify a proxy type")
}
if strings.Contains(proxyType, ":") {
common.LogWarn("Detected potential port mapping instead of proxy type")
return errors.New("Consider using ports:set command or specifying a valid proxy")
}
key := "DOKKU_APP_PROXY_TYPE"
if appName == "--global" {
key = "DOKKU_PROXY_TYPE"

8
tests/unit/proxy.bats
View File

@@ -28,6 +28,14 @@ teardown() {
assert_output "$help_output"
}
@test "(proxy:set) invalid port mapping set" {
run /bin/bash -c "dokku proxy:set $TEST_APP http:80:80"
echo "output: $output"
echo "status: $status"
assert_failure
assert_output_contains "Detected potential port mapping instead of proxy type"
}
@test "(proxy) proxy:build-config/clear-config" {
run deploy_app
echo "output: $output"