Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -49,9 +49,9 @@ public static String getUserId(@NotNull HttpServletRequest request) {
String userId = session.getUserContext().getUserId();
if (userId == null) {
if (session.getUserContext().isAuthorizedInSecurityManager()) {
return QMConstants.QM_ANONYMOUS_DOMAIN;
return QMConstants.QM_ANONYMOUS_USER;
}
return QMConstants.QM_UNAUTHORIZED_DOMAIN;
return QMConstants.QM_UNAUTHORIZED_USER;
}
return userId;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ protected final void service(HttpServletRequest request, HttpServletResponse res
} finally {
if (WebAppUtils.getWebApplication() instanceof ApiCallInterceptor apiCallInterceptor) {
apiCallInterceptor.onApiCallEvent(
request, getVariables(request), request.getRequestURI(), null, startTime, errorMessage, API_PROTOCOL
request, getVariables(request), request.getRequestURI(), webSession.getUserId(), startTime, errorMessage, API_PROTOCOL
);
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@
import org.jkiss.dbeaver.model.auth.SMAuthStatus;
import org.jkiss.dbeaver.model.auth.SMSessionExternal;
import org.jkiss.dbeaver.model.preferences.DBPPropertyDescriptor;
import org.jkiss.dbeaver.model.qm.QMConstants;
import org.jkiss.dbeaver.model.security.SMConstants;
import org.jkiss.dbeaver.model.security.SMController;
import org.jkiss.dbeaver.model.security.SMSubjectType;
Expand Down Expand Up @@ -385,7 +386,7 @@ private WebUserInfo getAnonymousUserInfo(@NotNull WebSession webSession) {
if (!application.getAppConfiguration().isAnonymousAccessEnabled() || !webSession.isAuthorizedInSecurityManager()) {
return null;
}
SMUser anonymous = new SMUser("anonymous", true, null);
SMUser anonymous = new SMUser(QMConstants.QM_ANONYMOUS_USER, true, null);
return new WebUserInfo(webSession, new WebUser(anonymous));
}
}
Loading