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.

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

Merge 2.319 security fixes back into master #5880

Merged
merged 12 commits into from
Nov 4, 2021

Conversation

daniel-beck
Copy link
Member

@daniel-beck daniel-beck commented Nov 4, 2021

Trial PR to see whether this builds on CI. If it does, I'll push to master directly.

Meanwhile, 2.319 is at https://github.com/jenkinsci/jenkins/releases/tag/jenkins-2.319

@jglick
Copy link
Member

jglick commented Nov 4, 2021

I'll push to master directly.

Why not simply merge this PR?

@daniel-beck
Copy link
Member Author

Passed enough (some sort of ATH infra failure?)

@timja
Copy link
Member

timja commented Nov 4, 2021

Passed enough (some sort of ATH infra failure?)

Not infra, can be reproduced locally, appears to be security regression: https://issues.jenkins.io/browse/JENKINS-67063?focusedCommentId=415616&page=com.atlassian.jira.plugin.system.issuetabpanels%3Acomment-tabpanel#comment-415616

@jglick
Copy link
Member

jglick commented Nov 4, 2021

I think a deleteDir() before https://github.com/jenkins-infra/pipeline-library/blob/4fd036d1da36d5dc9313d6f048b1f67f82cb0a3b/vars/runATH.groovy#L97 may solve it. Something weird with symlinks.

@timja
Copy link
Member

timja commented Nov 4, 2021

gets past it locally for me

@jglick
Copy link
Member

jglick commented Nov 4, 2021

File f = new File(baseDir, te.getName()).getCanonicalFile();
is wrong I think. Trying to figure out how this should work instead.

@timja
Copy link
Member

timja commented Nov 5, 2021

the deleteDir has unblocked ATH

@jglick
Copy link
Member

jglick commented Nov 5, 2021

check #5886

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants