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

[infra] use $SWITCH_UID if it is defined (fixes #30) #211

Merged
merged 3 commits into from
Dec 21, 2016
Merged

[infra] use $SWITCH_UID if it is defined (fixes #30) #211

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
bbaf389
[infra] use $SWITCH_UID if it is defined (fixes #30)
mikea Dec 20, 2016
fe67713
[infra] using SWITCH_UID id helper as well
mikea Dec 20, 2016
d6a3e55
renaming UID variable, using /
mikea Dec 21, 2016
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
1 change: 1 addition & 0 deletions infra/base-images/base-libfuzzer/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ Build configuration is performed through following environment variables:
| `$SANITIZER ("address")` | Specifies sanitizer configuration to use. `address` or `undefined`.
| `$SANITIZER_FLAGS` | Specify compiler sanitizer flags directly. Overrides `$SANITIZER`.
| `$COVERAGE_FLAGS` | Specify compiler flags to use for fuzzer feedback coverage.
| `$BUILD_UID` | User id to use while building fuzzers.

# Examples

Expand Down
10 changes: 9 additions & 1 deletion infra/base-images/base-libfuzzer/compile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,4 +42,12 @@ echo "CXXFLAGS=$CXXFLAGS"

echo "---------------------------------------------------------------"

bash -x $SRC/build.sh
BUILD_CMD="bash -x $SRC/build.sh"
if [ -z "${BUILD_UID+}" ]; then
adduser -u $BUILD_UID --disabled-password --no-create-home --gecos '' builder
chown -R builder $SRC
chown builder $OUT
su -c "$BUILD_CMD" builder
else
$BUILD_CMD
fi
1 change: 1 addition & 0 deletions infra/helper.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,6 +148,7 @@ def build_fuzzers(build_args):

command = [
'docker', 'run', '--rm', '-i', '--cap-add', 'SYS_PTRACE',
'-e', 'BUILD_UID=%d' % os.getuid(),
'-v', '%s:/out' % os.path.join(BUILD_DIR, 'out', args.project_name),
'-v', '%s:/work' % os.path.join(BUILD_DIR, 'work', args.project_name),
'-t', 'ossfuzz/' + args.project_name,
Expand Down
10 changes: 4 additions & 6 deletions infra/libfuzzer-pipeline.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ def call(body) {
body()

def project = new groovy.json.JsonSlurperClassic().parseText(config["project_json"])
def uid = sh(returnStdout: true, script: 'id -u $USER').trim()

// Project configuration.
def projectName = project["name"] ?: env.JOB_BASE_NAME
Expand All @@ -38,18 +39,15 @@ def call(body) {
def dockerGit = dockerfileConfig["git"]
def dockerContextDir = dockerfileConfig["context"] ?: ""
def dockerTag = "ossfuzz/$projectName"
def dockerUid = 0 // TODO: try to make $USER to work
def dockerRunOptions = "--user $dockerUid --cap-add SYS_PTRACE"

def dockerRunOptions = "-e BUILD_UID=$uid --cap-add SYS_PTRACE"

def date = java.time.format.DateTimeFormatter.ofPattern("yyyyMMddHHmm")
.format(java.time.LocalDateTime.now())

node {
def workspace = pwd()
// def uid = sh(returnStdout: true, script: 'id -u $USER').trim()
echo "using uid $dockerUid"

def srcmapFile = "$workspace/srcmap.json"

echo "Building $dockerTag: $project"

sh "docker run --rm $dockerRunOptions -v $workspace:/workspace ubuntu bash -c \"rm -rf /workspace/out\""
Expand Down