Skip to content

Commit 5c10b38

Browse files
author
Vladimir Kotal
committed
rename files with Oracle SSO header decoding
1 parent 2f1ccdc commit 5c10b38

File tree

4 files changed

+17
-15
lines changed

4 files changed

+17
-15
lines changed

plugins/UserPlugin/src/opengrok/auth/plugin/UserPlugin.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@
2424

2525
import java.util.Map;
2626
import javax.servlet.http.HttpServletRequest;
27-
import opengrok.auth.plugin.decoders.FakeHeaderDecoder;
28-
import opengrok.auth.plugin.decoders.HeaderDecoder;
27+
import opengrok.auth.plugin.decoders.FakeOSSOHeaderDecoder;
28+
import opengrok.auth.plugin.decoders.OSSOHeaderDecoder;
2929
import opengrok.auth.plugin.decoders.IUserDecoder;
3030
import opengrok.auth.plugin.entity.User;
3131
import org.opensolaris.opengrok.authorization.IAuthorizationPlugin;
@@ -43,15 +43,15 @@ public class UserPlugin implements IAuthorizationPlugin {
4343

4444
public static final String REQUEST_ATTR = "opengrok-user-plugin-user";
4545

46-
private IUserDecoder decoder = new HeaderDecoder();
46+
private IUserDecoder decoder = new OSSOHeaderDecoder();
4747

4848
@Override
4949
public void load(Map<String, Object> parameters) {
5050
Boolean fake;
5151

5252
if ((fake = (Boolean) parameters.get(FAKE_PARAM)) != null
5353
&& fake) {
54-
decoder = new FakeHeaderDecoder();
54+
decoder = new FakeOSSOHeaderDecoder();
5555
}
5656
}
5757

plugins/UserPlugin/src/opengrok/auth/plugin/decoders/FakeHeaderDecoder.java renamed to plugins/UserPlugin/src/opengrok/auth/plugin/decoders/FakeOSSOHeaderDecoder.java

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,18 +17,21 @@
1717
* CDDL HEADER END
1818
*/
1919

20-
/*
20+
/*
2121
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
2222
*/
2323
package opengrok.auth.plugin.decoders;
2424

2525
/**
26+
* Almost like @{code OSSOHeaderDecoder} however uses HTTP headers with
27+
* the "my-" prefix which allows for custom header insertion.
28+
* This class should therefore only be used for debugging.
2629
*
2730
* @author Krystof Tulinger
2831
*/
29-
public class FakeHeaderDecoder extends HeaderDecoder {
32+
public class FakeOSSOHeaderDecoder extends OSSOHeaderDecoder {
3033

31-
public FakeHeaderDecoder() {
34+
public FakeOSSOHeaderDecoder() {
3235
OSSO_COOKIE_TIMESTAMP_HEADER = "my-osso-cookie-timestamp";
3336
OSSO_TIMEOUT_EXCEEDED_HEADER = "my-osso-idle-timeout-exceeded";
3437
OSSO_SUBSCRIBER_DN_HEADER = "my-osso-subscriber-dn";

plugins/UserPlugin/src/opengrok/auth/plugin/decoders/HeaderDecoder.java renamed to plugins/UserPlugin/src/opengrok/auth/plugin/decoders/OSSOHeaderDecoder.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,9 @@
3434
*
3535
* @author Krystof Tulinger
3636
*/
37-
public class HeaderDecoder implements IUserDecoder {
37+
public class OSSOHeaderDecoder implements IUserDecoder {
3838

39-
private static final Logger LOGGER = Logger.getLogger(HeaderDecoder.class.getName());
39+
private static final Logger LOGGER = Logger.getLogger(OSSOHeaderDecoder.class.getName());
4040

4141
protected static String OSSO_COOKIE_TIMESTAMP_HEADER = "osso-cookie-timestamp";
4242
protected static String OSSO_TIMEOUT_EXCEEDED_HEADER = "osso-idle-timeout-exceeded";

plugins/UserPlugin/test/opengrok/auth/plugin/decoders/DecoderTest.java renamed to plugins/UserPlugin/test/opengrok/auth/plugin/decoders/OSSODecoderTest.java

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
* CDDL HEADER END
1818
*/
1919

20-
/*
20+
/*
2121
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
2222
*/
2323
package opengrok.auth.plugin.decoders;
@@ -29,13 +29,14 @@
2929
import org.junit.Test;
3030

3131
/**
32+
* Test OSSO header decoder.
3233
*
3334
* @author Krystof Tulinger
3435
*/
35-
public class DecoderTest {
36+
public class OSSODecoderTest {
3637

3738
DummyHttpServletRequest dummyRequest;
38-
HeaderDecoder decoder = new HeaderDecoder();
39+
OSSOHeaderDecoder decoder = new OSSOHeaderDecoder();
3940

4041
@Before
4142
public void setUp() {
@@ -144,9 +145,7 @@ public void testInvalidGetCookieTimestamp() {
144145
"ffffx" // not a hex number
145146
};
146147

147-
for (int i = 0;
148-
i < tests.length;
149-
i++) {
148+
for (int i = 0; i < tests.length; i++) {
150149
dummyRequest.setHeader("osso-cookie-timestamp", tests[i]);
151150
Assert.assertNotNull(u = decoder.fromRequest(dummyRequest));
152151
Assert.assertNull(u.getCookieTimestamp());

0 commit comments

Comments
 (0)