read the exposure scope from the compose file, drop the _EXPOSE variable
The variable declared an intent and changed nothing: it fed the report and
never the binding, so it could say public while the file published on the
loopback, or the reverse. A declaration that cannot be wrong is better than one
that has to be kept in step.
The scope is now which binding the file asks for, read from the compose files
as written: ${MYOS_BIND_PUBLIC} is public, a hand-written address is pinned,
and a bare '- 80' or '9000:9000' is unbound, meaning docker opens it on every
address and nobody chose that. --strict fails on those.
Reading the resolved configuration instead would lose the distinction: every
form ends up as a plain address, and an unbound port looks exactly like a
deliberate public one.
What is left to configure per host is the address of each scope, which is the
part that belongs to the host rather than to the stack.
This commit is contained in:
+45
-31
@@ -1,52 +1,56 @@
|
||||
#shellcheck shell=sh
|
||||
# myos expose [--strict] what the stacks publish, and to whom
|
||||
#
|
||||
# Reads the resolved compose configuration, so it reports what `myos up` would
|
||||
# open rather than what happens to be running. A port bound to 0.0.0.0 answers
|
||||
# the internet: on linux docker writes its own firewall rules and the host
|
||||
# firewall does not see it. --strict exits 1 when a port is world-bound
|
||||
# without the stack declaring that scope.
|
||||
# Two readings are joined: the compose files as written, which say which
|
||||
# binding each port asks for, and the resolved configuration, which says the
|
||||
# address it ends up on. The first is the intent, the second is the fact, and
|
||||
# reporting both is the point: a port nobody bound answers the internet, and on
|
||||
# linux the host firewall does not see it, because docker writes its own rules.
|
||||
#
|
||||
# --strict exits 1 when a port is published without a binding.
|
||||
myos_cmd_expose() {
|
||||
_strict=false
|
||||
case ${MYOS_ARGS:-}${MYOS_VARS:-} in *--strict*) _strict=true ;; esac
|
||||
|
||||
_rows=$(myos_expose_rows)
|
||||
[ -n "$_rows" ] || { printf 'no published port: nothing is reachable from outside the docker network\n'; return 0; }
|
||||
[ -n "$_rows" ] || {
|
||||
printf 'no published port: nothing is reachable from outside the docker network\n'
|
||||
return 0
|
||||
}
|
||||
|
||||
printf '%s%-20s %-14s %-22s %-6s %s%s\n' \
|
||||
"$MYOS_C_HIGHLIGHT" STACK SERVICE "PUBLISHED ON" PORT SCOPE "$MYOS_C_RESET"
|
||||
"$MYOS_C_HIGHLIGHT" STACK SERVICE "PUBLISHED ON" PORT BINDING "$MYOS_C_RESET"
|
||||
_bad=0
|
||||
_oIFS=$IFS; IFS='
|
||||
'
|
||||
for _row in $_rows; do
|
||||
IFS=$_oIFS
|
||||
_st=${_row%%|*}; _rest=${_row#*|}
|
||||
_sv=${_rest%%|*}; _rest=${_rest#*|}
|
||||
_on=${_rest%%|*}; _rest=${_rest#*|}
|
||||
_pt=${_rest%%|*}; _sc=${_rest#*|}
|
||||
case ${_on%:*} in
|
||||
0.0.0.0|''|'::'|'*')
|
||||
[ "$_sc" = public ] || _bad=$((_bad + 1))
|
||||
printf '%-20s %-14s %s%-22s%s %-6s %s\n' \
|
||||
"$_st" "$_sv" "$MYOS_C_WARN" "$_on" "$MYOS_C_RESET" "$_pt" "$_sc" ;;
|
||||
*)
|
||||
printf '%-20s %-14s %-22s %-6s %s\n' "$_st" "$_sv" "$_on" "$_pt" "$_sc" ;;
|
||||
esac
|
||||
_st=${_row%%|*}; _r=${_row#*|}
|
||||
_sv=${_r%%|*}; _r=${_r#*|}
|
||||
_on=${_r%%|*}; _r=${_r#*|}
|
||||
_pt=${_r%%|*}; _sc=${_r#*|}
|
||||
if [ "$_sc" = unbound ]; then
|
||||
_bad=$((_bad + 1))
|
||||
printf '%-20s %-14s %s%-22s%s %-6s %s%s%s\n' "$_st" "$_sv" \
|
||||
"$MYOS_C_WARN" "$_on" "$MYOS_C_RESET" "$_pt" "$MYOS_C_WARN" "$_sc" "$MYOS_C_RESET"
|
||||
else
|
||||
printf '%-20s %-14s %-22s %-6s %s\n' "$_st" "$_sv" "$_on" "$_pt" "$_sc"
|
||||
fi
|
||||
IFS='
|
||||
'
|
||||
done
|
||||
IFS=$_oIFS
|
||||
|
||||
if [ "$_bad" -gt 0 ]; then
|
||||
myos_warning "$_bad port(s) reachable from anywhere without declaring the public scope"
|
||||
myos_warning "bind them: ports: [\"\${MYOS_BIND_PRIVATE}::<port>\"]"
|
||||
myos_warning "$_bad port(s) published without a binding: docker opens them on every address"
|
||||
# shellcheck disable=SC2016 # the variable name is the message, not a value
|
||||
myos_warning 'bind them: ports: ["${MYOS_BIND_PRIVATE}::<port>"] for a service behind the load balancer'
|
||||
[ "$_strict" = true ] && return "$MYOS_E_FAIL"
|
||||
fi
|
||||
return 0
|
||||
}
|
||||
|
||||
# myos_expose_rows STACK|SERVICE|ADDR:PORT|CONTAINER_PORT|SCOPE for every
|
||||
# published port of the requested stacks
|
||||
# myos_expose_rows STACK|SERVICE|ADDR:PORT|CONTAINER_PORT|BINDING
|
||||
myos_expose_rows() {
|
||||
for _ref in $MYOS_STACKS; do
|
||||
_files=$(myos_stack_compose_files "$_ref" 2>/dev/null) || continue
|
||||
@@ -56,15 +60,26 @@ myos_expose_rows() {
|
||||
$_fw"
|
||||
_app=$(myos_stack_name "$_ref")
|
||||
_project=$(myos_project_name "$(myos_scope "$_ref")" "$USER" "$ENV" "$_app")
|
||||
|
||||
# what the files ask for, later overlays overriding earlier ones
|
||||
_decl=$(mktemp "${TMPDIR:-/tmp}/myos-expose.XXXXXX")
|
||||
# shellcheck disable=SC2086 # a newline separated list of paths
|
||||
myos_expose_declared $_files > "$_decl" 2>/dev/null
|
||||
|
||||
DRYRUN=false myos_compose "$_project" "$_files" -- config 2>/dev/null |
|
||||
myos_expose_parse "$_ref" "$(myos_stack_prefix "$_ref")"
|
||||
myos_expose_resolved |
|
||||
while IFS='|' read -r _v _t _o; do
|
||||
_b=$(awk -F'|' -v s="$_v" -v p="$_t" '$1==s && $2==p {last=$3} END {print last}' "$_decl")
|
||||
printf '%s|%s|%s|%s|%s\n' "$_ref" "$_v" "$_o" "$_t" "${_b:-unbound}"
|
||||
done
|
||||
rm -f "$_decl"
|
||||
done
|
||||
}
|
||||
|
||||
# myos_expose_parse STACK NAME (compose config on stdin)
|
||||
# myos_expose_resolved (compose config on stdin) -> SERVICE|CONTAINER_PORT|ADDR:PORT
|
||||
# compose normalises every port to the long form, so one shape is enough
|
||||
myos_expose_parse() {
|
||||
awk -v stack="$1" '
|
||||
myos_expose_resolved() {
|
||||
awk '
|
||||
/^services:/ { insvc = 1; next }
|
||||
insvc && /^ [a-zA-Z0-9_.-]+:/ { svc = $1; sub(/:$/, "", svc); inports = 0 }
|
||||
insvc && /^ ports:/ { inports = 1; next }
|
||||
@@ -73,10 +88,9 @@ myos_expose_parse() {
|
||||
inports && /published:/ { pub = $2; gsub(/"/, "", pub) }
|
||||
inports && /target:/ { tgt = $2 }
|
||||
inports && /protocol:/ {
|
||||
printf "%s|%s|%s:%s|%s\n", stack, svc, (ip == "" ? "0.0.0.0" : ip), pub, tgt
|
||||
# compose leaves published empty when docker picks the port at run time
|
||||
printf "%s|%s|%s:%s\n", svc, tgt, (ip == "" ? "0.0.0.0" : ip), (pub == "" ? "auto" : pub)
|
||||
ip = ""; pub = ""; tgt = ""
|
||||
}
|
||||
' | while IFS='|' read -r _s _v _o _t; do
|
||||
printf '%s|%s|%s|%s|%s\n' "$_s" "$_v" "$_o" "$_t" "$(myos_expose_scope "$2" "$_v" "$_t")"
|
||||
done
|
||||
'
|
||||
}
|
||||
|
||||
+44
-12
@@ -15,7 +15,11 @@
|
||||
# mesh the private network between the hosts of the fleet
|
||||
# private this host only: everything the load balancer reaches for you
|
||||
#
|
||||
# MYOS_BIND_<SCOPE> overrides any of them.
|
||||
# A stack does not declare its scope on the side: it is which of these it binds
|
||||
# to, read from the compose file. One source of truth, which cannot drift from
|
||||
# what is actually published. MYOS_BIND_<SCOPE> sets the address of a scope on
|
||||
# a given host, which is the part that belongs to the host rather than to the
|
||||
# stack.
|
||||
|
||||
# myos_bind SCOPE the address a port of that scope binds to
|
||||
myos_bind() {
|
||||
@@ -66,15 +70,43 @@ myos_stack_prefix() {
|
||||
esac
|
||||
}
|
||||
|
||||
# myos_expose_scope PREFIX SERVICE PORT the scope a stack declares for a port:
|
||||
# <PREFIX>_SERVICE_<port>_EXPOSE, then <PREFIX>_SERVICE_EXPOSE, then the same
|
||||
# two on the service name, else private
|
||||
myos_expose_scope() {
|
||||
_u=$(myos_upper "$1")
|
||||
for _n in "${_u}_SERVICE_${3}_EXPOSE" "${_u}_SERVICE_EXPOSE" \
|
||||
"$(myos_upper "$2")_SERVICE_${3}_EXPOSE" "$(myos_upper "$2")_SERVICE_EXPOSE"; do
|
||||
_s=$(myos_var "$_n")
|
||||
[ -n "$_s" ] && { printf '%s' "$_s"; return 0; }
|
||||
done
|
||||
printf 'private'
|
||||
# myos_expose_declared FILE... SERVICE|CONTAINER_PORT|SCOPE for every port a
|
||||
# compose file publishes, read from the file as written rather than from the
|
||||
# resolved configuration.
|
||||
#
|
||||
# The scope is not declared twice: it is which binding the file asks for.
|
||||
# ${MYOS_BIND_PUBLIC}:443:443 public
|
||||
# ${MYOS_BIND_PRIVATE}::8080 private
|
||||
# ${MYOS_BIND_MESH}::7946 mesh
|
||||
# 127.0.0.1:5432:5432 pinned to an address, deliberate but fixed
|
||||
# 80 or 8080:80 unbound: docker binds every address, and
|
||||
# nobody chose that
|
||||
#
|
||||
# Resolving first would lose the difference: ${MYOS_BIND_PRIVATE} and a
|
||||
# hand-written 127.0.0.1 both become 127.0.0.1, and an unbound port becomes
|
||||
# 0.0.0.0 exactly like a deliberate public one.
|
||||
myos_expose_declared() {
|
||||
awk '
|
||||
function emit(entry, e, scope, target) {
|
||||
e = entry
|
||||
gsub(/^[ \t"'"'"'-]+/, "", e); gsub(/["'"'"']+$/, "", e)
|
||||
if (e ~ /\$\{MYOS_BIND_PUBLIC[^}]*\}/) scope = "public"
|
||||
else if (e ~ /\$\{MYOS_BIND_MESH[^}]*\}/) scope = "mesh"
|
||||
else if (e ~ /\$\{MYOS_BIND_PRIVATE[^}]*\}/) scope = "private"
|
||||
else if (e ~ /^[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+:/) scope = "pinned"
|
||||
else if (e ~ /^\[/) scope = "pinned"
|
||||
else scope = "unbound"
|
||||
# the container port is the last field, minus any /protocol
|
||||
target = e
|
||||
sub(/\/[a-z]+$/, "", target)
|
||||
n = split(target, parts, ":")
|
||||
target = parts[n]
|
||||
if (target ~ /^[0-9]+(-[0-9]+)?$/) printf "%s|%s|%s\n", svc, target, scope
|
||||
}
|
||||
/^services:[ \t]*$/ { insvc = 1; next }
|
||||
insvc && /^ [a-zA-Z0-9_.-]+:[ \t]*$/ { svc = $1; sub(/:$/, "", svc); inports = 0 }
|
||||
insvc && /^ ports:/ { inports = 1; next }
|
||||
inports && /^ [a-zA-Z]/ { inports = 0 }
|
||||
inports && /^ *-/ { emit($0) }
|
||||
' "$@"
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user