Skip to content
Permalink
Browse files
Merge pull request #1005 from christ66/master
[FIXED JENKINS-8815] Fixed issue where CLI required giving Overall read ...

Conflicts:
	core/src/main/java/hudson/cli/CLIAction.java
  • Loading branch information
olivergondza committed Nov 11, 2013
2 parents d7b031a + a2ff610 commit a494868c47d103b7bb1457aaaeadf87a55bb48ba
Showing with 47 additions and 2 deletions.
  1. +2 −2 core/src/main/java/hudson/cli/CLIAction.java
  2. +45 −0 test/src/test/java/hudson/cli/CLIActionTest.java
@@ -32,6 +32,7 @@
import javax.servlet.http.HttpServletResponse;

import hudson.util.IOException2;
import hudson.model.UnprotectedRootAction;
import jenkins.model.Jenkins;

import org.kohsuke.accmod.Restricted;
@@ -44,7 +45,6 @@

import hudson.Extension;
import hudson.model.FullDuplexHttpChannel;
import hudson.model.RootAction;
import hudson.remoting.Channel;

/**
@@ -54,7 +54,7 @@
*/
@Extension
@Restricted(NoExternalUse.class)
public class CLIAction implements RootAction, StaplerProxy {
public class CLIAction implements UnprotectedRootAction, StaplerProxy {

private transient final Map<UUID,FullDuplexHttpChannel> duplexChannels = new HashMap<UUID, FullDuplexHttpChannel>();

@@ -0,0 +1,45 @@
/*
* The MIT License
*
* Copyright (c) 2013 christ66
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in
* all copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE.
*/

package hudson.cli;

import hudson.security.FullControlOnceLoggedInAuthorizationStrategy;
import org.jvnet.hudson.test.HudsonTestCase;

/**
* A Test unit to verify that CLIAction has .
*
* @author christ66
*/
public class CLIActionTest extends HudsonTestCase {
public void testCliActionUnprotectedRootActionTest() throws Exception {
WebClient wc = createWebClient();
wc.goTo("cli"); // Verify user can see cli before security

jenkins.setSecurityRealm(createDummySecurityRealm());
jenkins.setAuthorizationStrategy(new FullControlOnceLoggedInAuthorizationStrategy());

wc.goTo("cli"); // and after security enabled.
}
}

0 comments on commit a494868

Please sign in to comment.