Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: handling of user+group creation on Debian #900

Closed
wants to merge 1 commit into from
Closed

fix: handling of user+group creation on Debian #900

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
18 changes: 15 additions & 3 deletions rootfs/etc/profile.d/user.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,20 @@
#!/usr/bin/env bash

id "${USER}" &>/dev/null
if [[ "$?" -ne 0 ]]; then
if [[ -n "${GROUP}" ]] && ! id -g "${GROUP}" &>/dev/null; then
if [[ -n "${GROUP_ID}" ]]; then
addgroup --force-badname --gid "${GROUP_ID}" "${GROUP}" &>/dev/null
fi
fi

if ! id "${USER}" &>/dev/null; then
if [[ -n "${USER_ID}" ]] && [[ -n "${GROUP_ID}" ]]; then
adduser -D -u ${USER_ID} -g ${GROUP_ID} -h ${HOME} ${USER} &>/dev/null
if [[ "${GEODESIC_OS}" = 'debian' ]]; then
# Trust the host USER a much as permissible, to that end we need to force
# a bad username for cases in which the username may contain dots and the
# like.
adduser --force-badname --uid "${USER_ID}" --gid "${GROUP_ID}" --home "${HOME}" --disabled-password --gecos '' "${USER}" &>/dev/null
else
adduser -D -u "${USER_ID}" -g "${GROUP_ID}" -h "${HOME}" "${USER}" &>/dev/null
fi
fi
fi
5 changes: 5 additions & 0 deletions rootfs/templates/wrapper
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,10 @@ readonly OS=$(uname -s)

export USER_ID=$(id -u)
export GROUP_ID=$(id -g)
# While a dot in the username or groupname is frowned upon in POSIX user/group
# names, it is still permissible. Further more, it may help debug any oddities
# that arise with converting of names from ActiveDirectory/SSD/LDAP/etc..
export GROUP="$(id -gn|tr '[:blank:]-' '.')"

export options=()
export targets=()
Expand Down Expand Up @@ -68,6 +72,7 @@ function use() {
--env SSH_TTY
--env USER
--env USER_ID
--env GROUP
--env GROUP_ID)
elif [ "${OS}" == 'Darwin' ] && [ "${GEODESIC_MAC_FORWARD_SOCKET}" == 'true' ]; then
# Bind-mount SSH-agent socket (available in docker-for mac Edge 2.2 release)
Expand Down