Skip to content

Check if deviceRepresentation is set #33816

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

Merged
mposolda merged 1 commit into from
Oct 11, 2024
Merged

Check if deviceRepresentation is set #33816

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
2 changes: 1 addition & 1 deletion services/src/main/java/org/keycloak/utils/SecureContextResolver.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ static boolean isSecureContext(URI uri, Supplier<DeviceRepresentation> deviceRep
}

DeviceRepresentation deviceRepresentation = deviceRepresentationSupplier.get();
String browser = deviceRepresentation.getBrowser();
String browser = deviceRepresentation != null ? deviceRepresentation.getBrowser() : null;

// Safari has a bug where even a secure context is not able to set cookies with the 'Secure' directive.
// Hence, we need to assume the worst case scenario and downgrade to an insecure context.
Expand Down
41 changes: 25 additions & 16 deletions services/src/test/java/org/keycloak/utils/SecureContextResolverTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,16 @@

public class SecureContextResolverTest {

static final String BROWSER_SAFARI = "Safari/18.0.1";
static DeviceRepresentation DEVICE_UNKOWN;
static DeviceRepresentation DEVICE_SAFARI;

static {
DEVICE_UNKOWN = new DeviceRepresentation();
DEVICE_UNKOWN.setBrowser(DeviceRepresentation.UNKNOWN);

DEVICE_SAFARI = new DeviceRepresentation();
DEVICE_SAFARI.setBrowser("Safari/18.0.1");
}

@Test
public void testHttps() {
Expand Down Expand Up @@ -53,28 +62,28 @@ public void testLocalhost() {

@Test
public void testQuirksSafari() {
assertSecureContext("https://127.0.0.1", BROWSER_SAFARI, true);
assertSecureContext("https://something", BROWSER_SAFARI, true);
assertSecureContext("http://[::1]", BROWSER_SAFARI,false);
assertSecureContext("http://[0000:0000:0000:0000:0000:0000:0000:0001]", BROWSER_SAFARI, false);
assertSecureContext("http://localhost", BROWSER_SAFARI, false);
assertSecureContext("http://localhost.", BROWSER_SAFARI, false);
assertSecureContext("http://test.localhost", BROWSER_SAFARI, false);
assertSecureContext("http://test.localhost.", BROWSER_SAFARI, false);
assertSecureContext("https://127.0.0.1", DEVICE_SAFARI, true);
assertSecureContext("https://something", DEVICE_SAFARI, true);
assertSecureContext("http://[::1]", DEVICE_SAFARI,false);
assertSecureContext("http://[0000:0000:0000:0000:0000:0000:0000:0001]", DEVICE_SAFARI, false);
assertSecureContext("http://localhost", DEVICE_SAFARI, false);
assertSecureContext("http://localhost.", DEVICE_SAFARI, false);
assertSecureContext("http://test.localhost", DEVICE_SAFARI, false);
assertSecureContext("http://test.localhost.", DEVICE_SAFARI, false);
}

@Test
public void testNoDeviceRepresentation() {
assertSecureContext("http://localhost", null, true);
}

void assertSecureContext(String url, boolean expectedSecureContext) {
assertSecureContext(url, null, expectedSecureContext);
assertSecureContext(url, DEVICE_UNKOWN, expectedSecureContext);
}

void assertSecureContext(String url, String browser, boolean expectedSecureContext) {
DeviceRepresentation deviceRepresentation = new DeviceRepresentation();
void assertSecureContext(String url, DeviceRepresentation deviceRepresentation, boolean expectedSecureContext) {
Supplier<DeviceRepresentation> deviceRepresentationSupplier = () -> deviceRepresentation;

if (browser != null) {
deviceRepresentation.setBrowser(browser);
}

try {
Assert.assertEquals(expectedSecureContext, SecureContextResolver.isSecureContext(new URI(url), deviceRepresentationSupplier));
} catch (URISyntaxException e) {
Expand Down