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

Enable proxy usage for fetch remote resources #314

Open
wants to merge 1 commit into
base: v1-2
Choose a base branch
from
Open

Enable proxy usage for fetch remote resources #314

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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 19 additions & 1 deletion scap-workbench-pkexec-oscap.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,28 @@ PARENT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
PKEXEC_PATH="pkexec"
SCAP_WORKBENCH_OSCAP="$PARENT_DIR/scap-workbench-oscap.sh"

# Preserve proxy variables if they exist
ENV_STR=""
if [ -n "${http_proxy+x}" ]; then
ENV_STR+="http_proxy=\"$http_proxy\" "
fi

if [ -n "${https_proxy+x}" ]; then
ENV_STR+="https_proxy=\"$https_proxy\" "
fi

if [ -n "${no_proxy+x}" ]; then
ENV_STR+="no_proxy=\"$no_proxy\" "
fi

if [ -n "$ENV_STR" ]; then
ENV_STR="env $ENV_STR"
fi

# We run unprivileged if pkexec was not found.
#which $PKEXEC_PATH > /dev/null || exit 1 # fail if pkexec was not found

$PKEXEC_PATH --disable-internal-agent "$SCAP_WORKBENCH_OSCAP" $uid $gid "$@" 2> >(tail -n +2 1>&2)
$PKEXEC_PATH $ENV_STR --disable-internal-agent "$SCAP_WORKBENCH_OSCAP" $uid $gid "$@" 2> >(tail -n +2 1>&2)
EC=$?

# 126 is a special exit code of pkexec when user dismisses the auth dialog
Expand Down