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

fix(iot-dev): Add an upper limit to SAS token expiry time values #1755

Merged
merged 2 commits into from
Oct 20, 2023
Merged

fix(iot-dev): Add an upper limit to SAS token expiry time values #1755

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5027b27
fix(iot-dev): Add an upper limit to SAS token expiry time values
timtay-microsoft Oct 20, 2023
d56c6c3
Merge branch 'main' into timtay/limit
timtay-microsoft Oct 20, 2023
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
9 changes: 9 additions & 0 deletions ...t-device-client/src/main/java/com/microsoft/azure/sdk/iot/device/ClientConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,8 @@ public final class ClientConfiguration

private static final long DEFAULT_OPERATION_TIMEOUT = 4 * 60 * 1000; //4 minutes

private static final long MAX_SAS_TOKEN_EXPIRY_TIME_SECONDS = 10 * 365 * 24 * 60 * 60; //10 years

private boolean useWebsocket;

@Getter
Expand Down Expand Up @@ -244,6 +246,13 @@ private void setClientOptionValues(ClientOptions clientOptions)
throw new IllegalArgumentException("ClientOption sasTokenExpiryTime must be greater than 0");
}

if (clientOptions.getSasTokenExpiryTime() >= MAX_SAS_TOKEN_EXPIRY_TIME_SECONDS)
{
// Higher values cause overflows that result in the SDK repeatedly renewing SAS tokens
// and are generally a security risk
throw new IllegalArgumentException("ClientOption sasTokenExpiryTime must be less than 10 years");
}

this.getSasTokenAuthentication().setTokenValidSecs(clientOptions.getSasTokenExpiryTime());
}

Expand Down
Loading