Skip to content
This repository has been archived by the owner on Jan 20, 2022. It is now read-only.

[GSC] Always use absolute paths inside the Docker container #2151

Merged
merged 1 commit into from
Feb 16, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion Tools/gsc/finalize_manifest.py
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ def main(args=None):
if not os.path.isdir(args.dir):
argparser.error(f'\t[from inside Docker container] Could not find directory `{args.dir}`.')

env = jinja2.Environment(loader=jinja2.FileSystemLoader('.'))
env = jinja2.Environment(loader=jinja2.FileSystemLoader('/'))
env.globals.update({'library_paths': generate_library_paths(), 'env_path': os.getenv('PATH')})

manifest = 'entrypoint.manifest'
Expand Down
13 changes: 7 additions & 6 deletions Tools/gsc/templates/Dockerfile.ubuntu18.04.build.template
Original file line number Diff line number Diff line change
Expand Up @@ -56,17 +56,18 @@ COPY entrypoint.manifest /

# Generate trusted arguments if required
{% if not insecure_args %}
RUN /graphene/Tools/argv_serializer {{binary}} {{binary_arguments}} "{{"\" \"".join(cmd)}}" > trusted_argv
RUN /graphene/Tools/argv_serializer {{binary}} {{binary_arguments}} "{{"\" \"".join(cmd)}}" > /trusted_argv
{% endif %}

# Docker entrypoint/cmd typically contains only the basename of the executable so create a symlink
RUN which {{binary}} | xargs ln -s || true
RUN cd / \
&& which {{binary}} | xargs ln -s || true

# Mark apploader.sh executable, finalize manifest, and remove intermediate scripts
RUN chmod u+x apploader.sh \
&& python3 -B finalize_manifest.py \
&& rm -f finalize_manifest.py
RUN chmod u+x /apploader.sh \
&& python3 -B /finalize_manifest.py \
&& rm -f /finalize_manifest.py

# Define default command
ENTRYPOINT ["/bin/bash", "./apploader.sh"]
ENTRYPOINT ["/bin/bash", "/apploader.sh"]
CMD [{% if insecure_args %} "{{'", "'.join(cmd)}}" {% endif %}]
6 changes: 3 additions & 3 deletions Tools/gsc/templates/apploader.template
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ set -ex
if [ -z "$GSC_PAL" ] || [ "$GSC_PAL" == "Linux-SGX" ]
then
GSC_PAL=Linux-SGX
/graphene/python/graphene-sgx-get-token -output entrypoint.token -sig entrypoint.sig
/graphene/Runtime/pal-$GSC_PAL /graphene/Runtime/libpal-$GSC_PAL.so init entrypoint {% if insecure_args %}{{binary_arguments}} "${@}"{% endif %}
/graphene/python/graphene-sgx-get-token -output /entrypoint.token -sig /entrypoint.sig
/graphene/Runtime/pal-$GSC_PAL /graphene/Runtime/libpal-$GSC_PAL.so init /entrypoint {% if insecure_args %}{{binary_arguments}} "${@}"{% endif %}
else
/graphene/Runtime/pal-$GSC_PAL /graphene/Runtime/libpal-$GSC_PAL.so init entrypoint {{binary_arguments}} "${@}"
/graphene/Runtime/pal-$GSC_PAL /graphene/Runtime/libpal-$GSC_PAL.so init /entrypoint {{binary_arguments}} "${@}"
fi
4 changes: 2 additions & 2 deletions Tools/gsc/templates/entrypoint.manifest.template
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ sgx.nonpie_binary = 1
loader.arg0_override = "{{binary}}"
loader.insecure__use_cmdline_argv = 1
{% else %}
loader.argv_src_file = "file:trusted_argv"
sgx.trusted_files.trusted_argv = "file:trusted_argv"
loader.argv_src_file = "file:/trusted_argv"
sgx.trusted_files.trusted_argv = "file:/trusted_argv"
{% endif %}

# All trusted files and the user defined manifest specifications should be after this line