Skip to content

Commit 53ffca9

Browse files
FarmGeek4LifeFarmGeek4Life
authored
Merge pull request #22 from FarmGeek4Life/master
Revert many changes over the last 24 hours
2 parents 96bc34c + b2e8580 commit 53ffca9

File tree

4 files changed

+72
-40
lines changed

4 files changed

+72
-40
lines changed

‎pom.xml

+30-3
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,18 @@
33
<parent>
44
<groupId>org.jenkins-ci.plugins</groupId>
55
<artifactId>plugin</artifactId>
6-
<version>4.49</version><!-- which version of Jenkins plugin pom is this plugin built against? -->
6+
<version>3.50</version><!-- which version of Jenkins plugin pom is this plugin built against? -->
77
<relativePath />
88
</parent>
99

1010
<properties>
1111
<changelist>999999-SNAPSHOT</changelist>
1212
<gitHubRepo>jenkinsci/negotiatesso-plugin</gitHubRepo>
13-
<jenkins.version>2.321</jenkins.version><!-- First version of Jenkins running JNA 5.10.0 -->
13+
<jenkins.version>2.181</jenkins.version>
1414
<java.level>8</java.level>
15-
<waffle.version>3.1.1</waffle.version>
15+
<waffle.version>2.0.0</waffle.version>
16+
<jna.version>5.3.1</jna.version>
17+
<slf4j.version>2.0.0-alpha0</slf4j.version><!-- Upgraded over jenkins requirement because of Waffle -->
1618
</properties>
1719

1820
<artifactId>NegotiateSSO</artifactId>
@@ -56,6 +58,31 @@
5658
<artifactId>waffle-jna</artifactId>
5759
<version>${waffle.version}</version>
5860
</dependency>
61+
<dependency>
62+
<groupId>net.java.dev.jna</groupId>
63+
<artifactId>jna</artifactId>
64+
<version>${jna.version}</version>
65+
</dependency>
66+
<dependency>
67+
<groupId>net.java.dev.jna</groupId>
68+
<artifactId>jna-platform</artifactId>
69+
<version>${jna.version}</version>
70+
</dependency>
71+
<dependency>
72+
<groupId>org.slf4j</groupId>
73+
<artifactId>jcl-over-slf4j</artifactId>
74+
<version>${slf4j.version}</version>
75+
</dependency>
76+
<dependency>
77+
<groupId>org.slf4j</groupId>
78+
<artifactId>slf4j-api</artifactId>
79+
<version>${slf4j.version}</version>
80+
</dependency>
81+
<dependency>
82+
<groupId>org.slf4j</groupId>
83+
<artifactId>slf4j-jdk14</artifactId>
84+
<version>${slf4j.version}</version>
85+
</dependency>
5986
<dependency>
6087
<groupId>org.mockito</groupId>
6188
<artifactId>mockito-core</artifactId>

‎src/main/java/com/github/farmgeek4life/jenkins/negotiatesso/NegSecFilter.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
4747
import javax.servlet.ServletResponse;
4848
import javax.servlet.http.HttpServletRequest;
4949
import javax.servlet.http.HttpServletResponse;
50-
import org.springframework.security.core.context.SecurityContextHolder;
50+
import org.acegisecurity.context.SecurityContextHolder;
5151

5252
import com.google.common.annotations.VisibleForTesting;
5353
import jenkins.model.Jenkins;

‎src/main/java/com/github/farmgeek4life/jenkins/negotiatesso/NegSecUserSeedFilter.java

+5-5
Original file line numberDiff line numberDiff line change
@@ -45,9 +45,9 @@
4545
import jenkins.model.Jenkins;
4646
import jenkins.security.SecurityListener;
4747
import jenkins.security.seed.UserSeedProperty;
48-
import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
49-
import org.springframework.security.core.Authentication;
50-
import org.springframework.security.core.userdetails.UserDetails;
48+
import org.acegisecurity.Authentication;
49+
import org.acegisecurity.providers.UsernamePasswordAuthenticationToken;
50+
import org.acegisecurity.userdetails.UserDetails;
5151
import org.kohsuke.accmod.restrictions.suppressions.SuppressRestrictedWarnings;
5252

5353
/**
@@ -85,12 +85,12 @@ private void authenticateJenkins(WindowsPrincipal principal, HttpServletRequest
8585
}
8686
Jenkins jenkins = Jenkins.get();
8787
SecurityRealm realm = jenkins.getSecurityRealm();
88-
UserDetails userDetails = realm.loadUserByUsername2(principalName);
88+
UserDetails userDetails = realm.loadUserByUsername(principalName);
8989
Authentication authToken = new UsernamePasswordAuthenticationToken(
9090
userDetails.getUsername(),
9191
userDetails.getPassword(),
9292
userDetails.getAuthorities());
93-
ACL.as2(authToken);
93+
ACL.as(authToken);
9494
populateUserSeed(httpRequest, userDetails.getUsername());
9595
SecurityListener.fireLoggedIn(userDetails.getUsername());
9696
}

‎src/test/java/com/github/farmgeek4life/jenkins/negotiatesso/NegotiateConfigTests.java

+36-31
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@
3535
import org.junit.Test;
3636
import org.junit.runners.model.Statement;
3737
import org.jvnet.hudson.test.RestartableJenkinsRule;
38-
import org.jvnet.hudson.test.RestartableJenkinsRule.Step;
3938

4039
import static org.junit.Assert.assertFalse;
4140
import static org.junit.Assert.assertNotNull;
@@ -70,10 +69,12 @@ private boolean IsWindowsOS() {
7069
*/
7170
@Test
7271
public void testNegotiateHasConfigPage() {
73-
rule.then(r -> {
74-
HtmlPage currentPage = rule.j.createWebClient().goTo("configureSecurity");
75-
HtmlElement enabled = currentPage.getElementByName("_.enabled");
76-
assertNotNull("Negotiate configuration page missing.", enabled);
72+
rule.addStep(new Statement() {
73+
@Override public void evaluate() throws Throwable {
74+
HtmlPage currentPage = rule.j.createWebClient().goTo("configureSecurity");
75+
HtmlElement enabled = currentPage.getElementByName("_.enabled");
76+
assertNotNull("Negotiate configuration page missing.", enabled);
77+
}
7778
});
7879

7980
}
@@ -83,11 +84,13 @@ public void testNegotiateHasConfigPage() {
8384
*/
8485
@Test
8586
public void testEnableNegotiate() {
86-
rule.then(r -> {
87-
HtmlPage currentPage = rule.j.createWebClient().goTo("configureSecurity");
88-
HtmlElement enabled = currentPage.getElementByName("_.enabled");
89-
enabled.fireEvent("click");
90-
assertNotNull("Optional block wasn't expanded.", currentPage.getElementByName("_.redirectEnabled"));
87+
rule.addStep(new Statement() {
88+
@Override public void evaluate() throws Throwable {
89+
HtmlPage currentPage = rule.j.createWebClient().goTo("configureSecurity");
90+
HtmlElement enabled = currentPage.getElementByName("_.enabled");
91+
enabled.fireEvent("click");
92+
assertNotNull("Optional block wasn't expanded.", currentPage.getElementByName("_.redirectEnabled"));
93+
}
9194
});
9295
}
9396

@@ -97,30 +100,32 @@ public void testEnableNegotiate() {
97100
*/
98101
@Test
99102
public void testIfConfigCanBeUpdated() throws Exception {
100-
rule.then(r -> {
101-
assertFalse("Plugin already enabled", NegotiateSSO.getInstance().getEnabled());
103+
rule.addStep(new Statement() {
104+
@Override public void evaluate() throws Throwable {
105+
assertFalse("Plugin already enabled", NegotiateSSO.getInstance().getEnabled());
106+
107+
HtmlPage currentPage = rule.j.createWebClient().goTo("configureSecurity");
108+
HtmlForm form = currentPage.getFormByName("config");
109+
assertNotNull(form);
102110

103-
HtmlPage currentPage = rule.j.createWebClient().goTo("configureSecurity");
104-
HtmlForm form = currentPage.getFormByName("config");
105-
assertNotNull(form);
111+
form.getInputByName("_.enabled").click();
112+
form.getSelectByName("_.principalFormat").setSelectedAttribute("both", true);
113+
form.getSelectByName("_.roleFormat").setSelectedAttribute("sid", true);
106114

107-
form.getInputByName("_.enabled").click();
108-
form.getSelectByName("_.principalFormat").setSelectedAttribute("both", true);
109-
form.getSelectByName("_.roleFormat").setSelectedAttribute("sid", true);
115+
try {
116+
rule.j.submit(form);
117+
// CS IGNORE EmptyBlock FOR NEXT 3 LINES. REASON: Mocks Tests.
118+
} catch (FailingHttpStatusCodeException e) {
119+
// Expected since filter cannot be added to Jenkins rule.
120+
}
110121

111-
try {
112-
rule.j.submit(form);
113-
// CS IGNORE EmptyBlock FOR NEXT 3 LINES. REASON: Mocks Tests.
114-
} catch (FailingHttpStatusCodeException e) {
115-
// Expected since filter cannot be added to Jenkins rule.
116-
}
117-
118-
boolean wasEnabled = NegotiateSSO.getInstance().getEnabled();
119-
if (IsWindowsOS()) {
120-
assertTrue("Plugin wasn't enabled after saving the new config", wasEnabled);
121-
}
122-
else {
123-
assertFalse("Plugin was enabled on a non-Windows OS", wasEnabled);
122+
boolean wasEnabled = NegotiateSSO.getInstance().getEnabled();
123+
if (IsWindowsOS()) {
124+
assertTrue("Plugin wasn't enabled after saving the new config", wasEnabled);
125+
}
126+
else {
127+
assertFalse("Plugin was enabled on a non-Windows OS", wasEnabled);
128+
}
124129
}
125130
});
126131
}

0 commit comments

Comments
 (0)