Skip to content

fix: Replace deprecated ACL.SYSTEM with ACL.SYSTEM2 in migrateCredentials() #1504

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

Closed
ArpanC6 wants to merge 5 commits into from
+14 −10
Closed

fix: Replace deprecated ACL.SYSTEM with ACL.SYSTEM2 in migrateCredentials() #1504

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
ccf57d7
Fix resource leak: wrap GroovyClassLoader in try-with-resources
Arpanchakraborty1 Mar 14, 2026
905624c
fix: apply spotless formatting
Arpanchakraborty1 Mar 15, 2026
dd29882
Apply spotless formatting
Arpanchakraborty1 Mar 16, 2026
6ba51fc
Fix indentation in try-with-resources block
Arpanchakraborty1 Mar 16, 2026
3835b9b
fix: Replace deprecated ACL.SYSTEM with ACL.SYSTEM2 in migrateCredent…
Arpanchakraborty1 Mar 17, 2026
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
Binary file modified .gitignore
View file
Open in desktop
Binary file not shown.
3 changes: 3 additions & 0 deletions .vscode/settings.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"java.compile.nullAnalysis.mode": "automatic"
}
17 changes: 9 additions & 8 deletions src/main/java/hudson/plugins/emailext/ExtendedEmailPublisher.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -856,16 +856,17 @@ private ClassLoader expandClasspath(ExtendedEmailPublisherContext context, Class
}

boolean useSecurity = Jenkins.get().isUseSecurity();
if (!classpathList.isEmpty()) {
GroovyClassLoader gloader = new GroovyClassLoader(loader);
gloader.setShouldRecompile(true);
for (ClasspathEntry entry : classpathList) {
if (useSecurity) {
ScriptApproval.get().using(entry);
if (!classpathList.isEmpty()) {
try (GroovyClassLoader gloader = new GroovyClassLoader(loader)) {
gloader.setShouldRecompile(true);
for (ClasspathEntry entry : classpathList) {
if (useSecurity) {
ScriptApproval.get().using(entry);
}
gloader.addURL(entry.getURL());
}
gloader.addURL(entry.getURL());
loader = gloader;
}
loader = gloader;
}
if (useSecurity) {
return GroovySandbox.createSecureClassLoader(loader);
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/hudson/plugins/emailext/MailAccount.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,7 +170,7 @@ public FormValidation doCheckCredentialsId(
if (CredentialsProvider.listCredentials(
StandardUsernamePasswordCredentials.class,
item,
item instanceof Queue.Task t ? Tasks.getAuthenticationOf(t) : ACL.SYSTEM,
item instanceof Queue.Task t ? Tasks.getAuthenticationOf2(t) : ACL.SYSTEM2,
null,
CredentialsMatchers.withId(value))
.isEmpty()) {
Expand Down Expand Up @@ -310,7 +310,7 @@ private void migrateCredentials() {
}
final List<StandardUsernamePasswordCredentials> credentials = CredentialsMatchers.filter(
CredentialsProvider.lookupCredentials(
StandardUsernamePasswordCredentials.class, Jenkins.get(), ACL.SYSTEM, domainRequirement),
StandardUsernamePasswordCredentials.class, Jenkins.get(), ACL.SYSTEM2, domainRequirement),
CredentialsMatchers.withUsername(smtpUsername));
for (final StandardUsernamePasswordCredentials cred : credentials) {
if (smtpPassword.getPlainText().equals(Secret.toString(cred.getPassword()))) {
Expand Down
Loading