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

Add privilege check to render-template script #1728

Merged
merged 11 commits into from
Jan 31, 2024
Merged

Add privilege check to render-template script #1728

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
ab02e19
Add privilege check to render-template script.
jdeanwallace Jan 25, 2024
ecd1f92
Merge branch 'master' into render-template-privileges
jdeanwallace Jan 25, 2024
c50799f
Debug exit code.
jdeanwallace Jan 25, 2024
90b779a
Revert "Debug exit code."
jdeanwallace Jan 28, 2024
398b7e0
Debug exit code.
jdeanwallace Jan 28, 2024
25143e8
Expand render-template command over multiple lines.
jdeanwallace Jan 28, 2024
f4d7dd5
Expand render-template command over multiple lines.
jdeanwallace Jan 28, 2024
2a70704
Fix error text.
jdeanwallace Jan 28, 2024
32dfaf0
Execute render-template script as tinypilot user.
jdeanwallace Jan 28, 2024
5193567
Add comment.
jdeanwallace Jan 30, 2024
ea2ad28
Move privilege check.
jdeanwallace Jan 30, 2024
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
30 changes: 15 additions & 15 deletions debian-pkg/debian/tinypilot.postinst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,23 +62,23 @@ MOUSE_PATH = '{{ tinypilot_mouse_interface }}'
EOF
)"
readonly SETTINGS_TEMPLATE
. venv/bin/activate && \
PYTHONPATH=/opt/tinypilot/app \
./scripts/render-template \
. venv/bin/activate
runuser tinypilot \
--command 'PYTHONPATH=/opt/tinypilot/app ./scripts/render-template' \
<<< "${SETTINGS_TEMPLATE}" \
> "${TINYPILOT_APP_SETTINGS}" && \
deactivate
> "${TINYPILOT_APP_SETTINGS}"
deactivate
chown "${TINYPILOT_USER}:${TINYPILOT_GROUP}" "${TINYPILOT_APP_SETTINGS}"
popd

# Populate TinyPilot's NGINX config file.
pushd /opt/tinypilot
. venv/bin/activate && \
PYTHONPATH=/opt/tinypilot/app \
./scripts/render-template \
. venv/bin/activate
runuser tinypilot \
--command 'PYTHONPATH=/opt/tinypilot/app ./scripts/render-template' \
< /usr/share/tinypilot/templates/tinypilot.conf.j2 \
> /etc/nginx/conf.d/tinypilot.conf && \
deactivate
> /etc/nginx/conf.d/tinypilot.conf
deactivate
popd

# Workaround to restore the default NGINX config that has been previously
Expand Down Expand Up @@ -110,12 +110,12 @@ if grep --silent '^dtoverlay=tc358743$' "${BOOT_CONFIG_PATH}" ; then
# Populate TinyPilot's EDID.
mkdir -p /home/ustreamer/edids
pushd /opt/tinypilot
. venv/bin/activate && \
PYTHONPATH=/opt/tinypilot/app \
./scripts/render-template \
. venv/bin/activate
runuser tinypilot \
--command 'PYTHONPATH=/opt/tinypilot/app ./scripts/render-template' \
<<< '{{ ustreamer_edid }}' \
> /home/ustreamer/edids/tc358743-edid.hex && \
deactivate
> /home/ustreamer/edids/tc358743-edid.hex
deactivate
chmod 0644 /home/ustreamer/edids/tc358743-edid.hex
popd
fi
Expand Down
10 changes: 5 additions & 5 deletions debian-pkg/opt/tinypilot-privileged/scripts/configure-janus
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,10 +34,10 @@ done

# Generate and write config file from template.
pushd /opt/tinypilot
. venv/bin/activate && \
PYTHONPATH=/opt/tinypilot/app \
./scripts/render-template \
. venv/bin/activate
runuser tinypilot \
--command 'PYTHONPATH=/opt/tinypilot/app ./scripts/render-template' \
< /usr/share/tinypilot/templates/janus.jcfg.j2 \
> /etc/janus/janus.jcfg && \
deactivate
> /etc/janus/janus.jcfg
deactivate
popd
11 changes: 11 additions & 0 deletions scripts/render-template
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ EOF
# pylint:disable=invalid-name

import argparse
import os
import sys

import jinja2
Expand All @@ -27,6 +28,16 @@ def main(_):


if __name__ == '__main__':
# Ensure that the script doesn't have unnecessary privileges.
# https://github.com/tiny-pilot/tinypilot-pro/issues/1190
if os.geteuid() == 0:
print("This script doesn't require root privileges.", file=sys.stderr)
print('Please re-run as tinypilot:', file=sys.stderr)
print(' runuser tinypilot --command',
f"'{' '.join(sys.argv)}'",
file=sys.stderr)
sys.exit(1)

parser = argparse.ArgumentParser(
prog='TinyPilot Template Renderer',
formatter_class=argparse.ArgumentDefaultsHelpFormatter)
Expand Down