Skip to content

feat: Add directory input to Maven builder #2538

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

Merged
merged 13 commits into from
Aug 15, 2023
Merged

feat: Add directory input to Maven builder #2538

Show file tree
Hide file tree
Changes from 11 commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
5d6119f
chore: Add directory input to Maven builder
AdamKorcz Aug 4, 2023
813c09e
validate paths
AdamKorcz Aug 7, 2023
b0a619c
remove empty line
AdamKorcz Aug 7, 2023
099aaf3
Tidy 'description' text
AdamKorcz Aug 8, 2023
f7afe72
change name of variable
AdamKorcz Aug 8, 2023
c4cd7f4
tidy if condition of validate_path
AdamKorcz Aug 8, 2023
b9e189c
use GITHUB_WORKSPACE instead of gh_root
AdamKorcz Aug 8, 2023
46f91e1
remove validation of gh_root_dir
AdamKorcz Aug 8, 2023
261fbb2
fix lint issue
AdamKorcz Aug 8, 2023
1bb5576
fix nit
AdamKorcz Aug 8, 2023
544e0cc
change gh_root_dir to GITHUB_WORKSPACE
AdamKorcz Aug 15, 2023
4af0415
Update action.yml
laurentsimon Aug 15, 2023
3ad7f69
Merge branch 'main' into maven-builder-test-updates
laurentsimon Aug 15, 2023
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
5 changes: 5 additions & 0 deletions .github/workflows/builder_maven_slsa3.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,11 @@ on:
required: false
default: 17
type: number
directory:
description: "Sub-directory to launch the build from. Must be under the workspace. Relative from the root of the file directory when invoking the builder."
required: false
type: string
default: "."

outputs:
provenance-name:
Expand Down
27 changes: 27 additions & 0 deletions internal/builders/maven/action.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,12 +68,39 @@ runs:
shell: bash
env:
SLSA_OUTPUTS_ARTIFACTS_FILE: ${{ inputs.slsa-layout-file }}
UNTRUSTED_PROJECT_ROOT: ${{ fromJson(inputs.slsa-workflow-inputs).directory }}
run: |
# Ensure no directory traversal.
# NOTE: the actions/download-artifact Action only creates files
# in the workspace directory, but this may change in the future.
# TODO(#1893): Consolidate directory traversal checks
validate_path() {
untrusted_path=$1
resolved_dir=$(readlink -m "$untrusted_path")
wd=$(readlink -m "${GITHUB_WORKSPACE}")
if [[ "${resolved_dir}" != "${wd}"/* ]] && [[ "${resolved_dir}" != "${wd}" ]]; then
if [[ "${RUNNER_TEMP}" != "" ]] && [[ "${resolved_dir}" != "${RUNNER_TEMP}"/* ]] && [[ "${resolved_dir}" != "${RUNNER_TEMP}" ]]; then
if [[ "${resolved_dir}" != /tmp/* ]] && [[ "${resolved_dir}" != "/tmp" ]]; then
echo "Path is not in the workspace or temp directory: $untrusted_path"
exit 1
fi
fi
fi
}

validate_path "${UNTRUSTED_PROJECT_ROOT}"

# remove trailing "/"'s with `realpath`
project_root=$(realpath "${UNTRUSTED_PROJECT_ROOT}")

mv ./__BUILDER_CHECKOUT_DIR__ ../__BUILDER_CHECKOUT_DIR__ \
&& cd ../__BUILDER_CHECKOUT_DIR__/actions/maven/publish/slsa-hashing-plugin \
&& mvn clean install \
&& cd - \
&& cd "${project_root}" \
&& mvn package -Drun.hash.jarfile=true
mv $(dirname "${SLSA_OUTPUTS_ARTIFACTS_FILE}") "${GITHUB_WORKSPACE}/../"
mv target "${GITHUB_WORKSPACE}/"
- name: Upload target
id: upload-target
uses: slsa-framework/slsa-github-generator/.github/actions/secure-upload-folder@main
Expand Down