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

[JENKINS-54176] Enable the authenticationCache #3694

Closed
wants to merge 1 commit into from
Closed

[JENKINS-54176] Enable the authenticationCache #3694

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
13 changes: 8 additions & 5 deletions core/src/main/java/hudson/cli/declarative/CLIRegisterer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,10 +32,11 @@
import hudson.cli.CLICommand;
import hudson.cli.CloneableCLICommand;
import hudson.model.Hudson;
import hudson.security.ACL;
import hudson.security.CliAuthenticator;
import jenkins.ExtensionComponentSet;
import jenkins.ExtensionRefreshException;
import jenkins.model.Jenkins;
import hudson.security.CliAuthenticator;
import org.acegisecurity.AccessDeniedException;
import org.acegisecurity.Authentication;
import org.acegisecurity.BadCredentialsException;
Expand All @@ -44,8 +45,8 @@
import org.jvnet.hudson.annotation_indexer.Index;
import org.jvnet.localizer.ResourceBundleHolder;
import org.kohsuke.args4j.ClassParser;
import org.kohsuke.args4j.CmdLineParser;
import org.kohsuke.args4j.CmdLineException;
import org.kohsuke.args4j.CmdLineParser;

import java.io.IOException;
import java.io.InputStream;
Expand All @@ -60,12 +61,12 @@
import java.util.Locale;
import java.util.MissingResourceException;
import java.util.Stack;
import static java.util.logging.Level.SEVERE;

import java.util.UUID;
import java.util.logging.Level;
import java.util.logging.Logger;

import static java.util.logging.Level.SEVERE;

/**
* Discover {@link CLIMethod}s and register them as {@link CLICommand} implementations.
*
Expand Down Expand Up @@ -214,8 +215,10 @@ public int main(List<String> args, Locale locale, InputStream stdin, PrintStream
parser.parseArgument(args);

Authentication auth = authenticator.authenticate();
if (auth == Jenkins.ANONYMOUS)
// isAnonymous requires non null value, but authenticate does not provide contract
if (auth == null || ACL.isAnonymous(auth)) {
auth = loadStoredAuthentication();
}
sc.setAuthentication(auth); // run the CLI with the right credential
hudson.checkPermission(Jenkins.READ);

Expand Down
38 changes: 22 additions & 16 deletions test/src/test/java/hudson/cli/CLIRegistererTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,37 +1,43 @@
package hudson.cli;

import static hudson.cli.CLICommandInvoker.Matcher.failedWith;
import static hudson.cli.CLICommandInvoker.Matcher.succeededSilently;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.CoreMatchers.containsString;
import static org.hamcrest.CoreMatchers.is;

import jenkins.model.Jenkins;
import hudson.cli.CLICommandInvoker;
import hudson.cli.CLICommandInvoker.Result;

import hudson.model.FreeStyleBuild;
import hudson.model.FreeStyleProject;
import org.junit.Rule;
import org.junit.Test;
import org.jvnet.hudson.test.JenkinsRule;

import static hudson.cli.CLICommandInvoker.Matcher.failedWith;
import static hudson.cli.CLICommandInvoker.Matcher.succeededSilently;
import static org.hamcrest.CoreMatchers.containsString;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;

public class CLIRegistererTest {

@Rule
public JenkinsRule j = new JenkinsRule();

/**
* See also {@link ClientAuthenticationCacheTest#overHttpAlsoForRegisterer()} for the equivalent using remoting / authenticationCache, i.e. login+logout
*/
@Test
public void testAuthWithSecurityRealmCLIAuthenticator() {
j.getInstance().setSecurityRealm(j.createDummySecurityRealm());
public void testAuthWithSecurityRealmCLIAuthenticator() throws Exception {
j.jenkins.setSecurityRealm(j.createDummySecurityRealm());
FreeStyleProject project = j.createFreeStyleProject();
FreeStyleBuild build1 = j.buildAndAssertSuccess(project);
assertFalse("By default the build log should not be kept", build1.isKeepLog());

CLICommandInvoker command = new CLICommandInvoker(j, "quiet-down");
CLICommandInvoker command = new CLICommandInvoker(j, "keep-build");

Result invocation = command.invokeWithArgs("--username", "foo", "--password", "invalid");
Result invocation = command.invokeWithArgs(project.getName(), build1.getNumber() + "", "--username", "foo", "--password", "invalid");
assertThat(invocation, failedWith(7));
assertThat(invocation.stderr(), containsString("ERROR: Bad Credentials. Search the server log for "));
assertThat("Unauthorized command was executed", Jenkins.getInstance().isQuietingDown(), is(false));
assertFalse("The command should have not been executed", build1.isKeepLog());

invocation = command.invokeWithArgs("--username", "foo", "--password", "foo");
invocation = command.invokeWithArgs(project.getName(), build1.getNumber() + "", "--username", "foo", "--password", "foo");
assertThat(invocation, succeededSilently());
assertThat("Authorized command was not executed", Jenkins.getInstance().isQuietingDown(), is(true));
assertTrue("The command should have been executed", build1.isKeepLog());
}
}
56 changes: 43 additions & 13 deletions test/src/test/java/hudson/cli/ClientAuthenticationCacheTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,35 +25,43 @@
package hudson.cli;

import com.google.common.collect.Lists;

import hudson.ExtensionList;
import hudson.Launcher;
import hudson.cli.declarative.CLIRegisterer;
import hudson.model.FreeStyleBuild;
import hudson.model.FreeStyleProject;
import hudson.security.FullControlOnceLoggedInAuthorizationStrategy;
import hudson.util.Secret;
import hudson.util.StreamTaskListener;
import java.io.ByteArrayOutputStream;
import java.io.File;
import java.util.Arrays;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
import java.util.logging.Level;
import javax.annotation.CheckForNull;
import jenkins.model.JenkinsLocationConfiguration;
import org.apache.commons.io.FileUtils;
import org.apache.commons.io.output.TeeOutputStream;
import static org.hamcrest.Matchers.containsString;

import org.junit.Before;
import org.junit.Test;
import static org.junit.Assert.*;
import org.junit.Ignore;
import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.TemporaryFolder;
import org.jvnet.hudson.test.For;
import org.jvnet.hudson.test.Issue;
import org.jvnet.hudson.test.JenkinsRule;
import org.jvnet.hudson.test.LoggerRule;

import javax.annotation.CheckForNull;
import java.io.ByteArrayOutputStream;
import java.io.File;
import java.util.Arrays;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
import java.util.logging.Level;

import static org.hamcrest.Matchers.containsString;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertThat;
import static org.junit.Assert.assertTrue;

public class ClientAuthenticationCacheTest {

@Rule
Expand Down Expand Up @@ -119,6 +127,28 @@ public void overHttp() throws Exception {
}
}

@Test
@Issue("JENKINS-54176")
@For(CLIRegisterer.class)
public void overHttpAlsoForRegisterer() throws Exception {
File jar = tmp.newFile("jenkins-cli.jar");
FileUtils.copyURLToFile(r.jenkins.getJnlpJars("jenkins-cli.jar").getURL(), jar);
r.jenkins.setSecurityRealm(r.createDummySecurityRealm());
r.jenkins.setAuthorizationStrategy(new FullControlOnceLoggedInAuthorizationStrategy());
r.jenkins.setSlaveAgentPort(-1);
assertCLI(0, null, jar, "login", "--username", "admin", "--password", "admin");
try {
FreeStyleProject project = r.createFreeStyleProject();
FreeStyleBuild build1 = r.buildAndAssertSuccess(project);
assertFalse("By default the build's log should not be kept", build1.isKeepLog());

assertCLI(0, null, jar, "keep-build", project.getName(), build1.getNumber() + "");
assertTrue("After invocation the build's log should be kept", build1.isKeepLog());
} finally {
assertCLI(0, null, jar, "logout");
}
}

@Test
public void getPropertyKey() throws Exception {
ClientAuthenticationCache cache = new ClientAuthenticationCache(null);
Expand Down