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

setNetworkTimeout checks for SQLPermission before proceeding #255

Merged
merged 2 commits into from
Apr 26, 2017
Merged

setNetworkTimeout checks for SQLPermission before proceeding #255

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f101596
setNetworkTimeout checks for SQLPermission before proceeding
xiangyushawn Apr 18, 2017
46c9f1c
fix comment
xiangyushawn Apr 18, 2017
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
17 changes: 16 additions & 1 deletion src/main/java/com/microsoft/sqlserver/jdbc/SQLServerConnection.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -210,8 +210,9 @@ ServerPortPlaceHolder getRoutingInfo() {
}

// Permission targets
// currently only callAbort is implemented
private static final String callAbortPerm = "callAbort";

private static final String SET_NETWORK_TIMEOUT_PERM = "setNetworkTimeout";

private boolean sendStringParametersAsUnicode = SQLServerDriverBooleanProperty.SEND_STRING_PARAMETERS_AS_UNICODE.getDefaultValue(); // see
// connection
Expand Down Expand Up @@ -4663,6 +4664,20 @@ public void setNetworkTimeout(Executor executor,
}

checkClosed();

// check for setNetworkTimeout permission
SecurityManager secMgr = System.getSecurityManager();
if (secMgr != null) {
try {
SQLPermission perm = new SQLPermission(SET_NETWORK_TIMEOUT_PERM);
secMgr.checkPermission(perm);
}
catch (SecurityException ex) {
MessageFormat form = new MessageFormat(SQLServerException.getErrString("R_permissionDenied"));
Object[] msgArgs = {SET_NETWORK_TIMEOUT_PERM};
SQLServerException.makeFromDriverError(this, this, form.format(msgArgs), null, true);
}
}

try {
tdsChannel.setNetworkTimeout(timeout);
Expand Down