Skip to content
This repository has been archived by the owner on Oct 20, 2024. It is now read-only.

Commit

Permalink
Fix CVE-2024-25715 for 2.7.6
Browse files Browse the repository at this point in the history 
Will break some tests though
  • Loading branch information
@babelouest
babelouest committed Feb 12, 2024
1 parent 11f57ec commit 6f2d4a6
Show file tree
Hide file tree
Showing 2 changed files with 67 additions and 63 deletions.
83 changes: 24 additions & 59 deletions src/plugin/protocol_oauth2.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -696,7 +696,7 @@ static int is_authorization_type_enabled(struct _oauth2_config * config, uint au

static json_t * check_client_valid(struct _oauth2_config * config, const char * client_id, const char * client_header_login, const char * client_header_password, const char * redirect_uri, unsigned short authorization_type, int implicit_flow, const char * ip_source) {
json_t * j_client, * j_element = NULL, * j_return;
int uri_found, authorization_type_enabled;
int uri_found = 0, authorization_type_enabled;
size_t index = 0;

if (client_id == NULL) {
Expand All @@ -707,20 +707,17 @@ static json_t * check_client_valid(struct _oauth2_config * config, const char *
return json_pack("{si}", "result", G_ERROR_PARAM);
}
j_client = config->glewlwyd_config->glewlwyd_callback_check_client_valid(config->glewlwyd_config, client_id, client_header_password);
if (check_result_value(j_client, G_OK)) {
if (check_result_value(j_client, G_OK) && json_object_get(json_object_get(j_client, "client"), "enabled") == json_true()) {
if (!implicit_flow && client_header_password == NULL && json_object_get(json_object_get(j_client, "client"), "confidential") == json_true()) {
y_log_message(Y_LOG_LEVEL_DEBUG, "check_client_valid - oauth2 - Error, confidential client must be authentified with its password, origin: %s", ip_source);
j_return = json_pack("{si}", "result", G_ERROR_UNAUTHORIZED);
} else {
if (redirect_uri != NULL) {
uri_found = 0;
json_array_foreach(json_object_get(json_object_get(j_client, "client"), "redirect_uri"), index, j_element) {
if (0 == o_strcmp(json_string_value(j_element), redirect_uri)) {
uri_found = 1;
}
}
} else {
uri_found = 1;
}

authorization_type_enabled = 0;
Expand Down Expand Up @@ -2444,8 +2441,8 @@ static int check_auth_type_auth_code_grant (const struct _u_request * request, s
// Check if client is allowed to perform this request
if (check_result_value(j_client, G_OK)) {
// Client is allowed to use auth_code grant with this redirection_uri
if (u_map_has_key(request->map_url, "g_continue")) {
if (!o_strnullempty(u_map_get(request->map_url, "scope"))) {
if (!o_strnullempty(u_map_get(request->map_url, "scope"))) {
if (u_map_has_key(request->map_url, "g_continue")) {
j_session = validate_session_client_scope(config, request, u_map_get(request->map_url, "client_id"), u_map_get(request->map_url, "scope"));
if (check_result_value(j_session, G_OK)) {
if (json_object_get(json_object_get(j_session, "session"), "authorization_required") == json_false()) {
Expand Down Expand Up @@ -2526,26 +2523,20 @@ static int check_auth_type_auth_code_grant (const struct _u_request * request, s
}
json_decref(j_session);
} else {
// Scope is not allowed for this user
y_log_message(Y_LOG_LEVEL_DEBUG, "check_auth_type_auth_code_grant - oauth2 - scope list is missing or empty, origin: %s", ip_source);
response->status = 302;
redirect_url = msprintf("%s%serror=invalid_scope%s", u_map_get(request->map_url, "redirect_uri"), (o_strchr(u_map_get(request->map_url, "redirect_uri"), '?')!=NULL?"&":"?"), state_param);
// Redirect to login page
redirect_url = get_login_url(config, request, "auth", u_map_get(request->map_url, "client_id"), u_map_get(request->map_url, "scope"), NULL);
ulfius_add_header_to_response(response, "Location", redirect_url);
o_free(redirect_url);
response->status = 302;
}
} else {
// Redirect to login page
redirect_url = get_login_url(config, request, "auth", u_map_get(request->map_url, "client_id"), u_map_get(request->map_url, "scope"), NULL);
ulfius_add_header_to_response(response, "Location", redirect_url);
o_free(redirect_url);
response->status = 302;
// Scope is not allowed for this user
y_log_message(Y_LOG_LEVEL_DEBUG, "check_auth_type_auth_code_grant - oauth2 - scope list is missing or empty, origin: %s", ip_source);
response->status = 403;
}
} else {
// client is not authorized
response->status = 302;
redirect_url = msprintf("%s%serror=unauthorized_client%s%s", u_map_get(request->map_url, "redirect_uri"), (o_strchr(u_map_get(request->map_url, "redirect_uri"), '?')!=NULL?"&":"?"), (u_map_get(request->map_url, "state")!=NULL?"&state=":""), (u_map_get(request->map_url, "state")!=NULL?u_map_get(request->map_url, "state"):""));
ulfius_add_header_to_response(response, "Location", redirect_url);
o_free(redirect_url);
response->status = 403;
config->glewlwyd_config->glewlwyd_plugin_callback_metrics_increment_counter(config->glewlwyd_config, GLWD_METRICS_OAUTH2_UNAUTHORIZED_CLIENT, 1, "plugin", config->name, NULL);
}
o_free(state_param);
Expand Down Expand Up @@ -2707,8 +2698,8 @@ static int check_auth_type_implicit_grant (const struct _u_request * request, st
// Check if client is allowed to perform this request
if (check_result_value(j_client, G_OK)) {
// Client is allowed to use auth_code grant with this redirection_uri
if (u_map_has_key(request->map_url, "g_continue")) {
if (!o_strnullempty(u_map_get(request->map_url, "scope"))) {
if (!o_strnullempty(u_map_get(request->map_url, "scope"))) {
if (u_map_has_key(request->map_url, "g_continue")) {
j_session = validate_session_client_scope(config, request, u_map_get(request->map_url, "client_id"), u_map_get(request->map_url, "scope"));
if (check_result_value(j_session, G_OK)) {
if (json_object_get(json_object_get(j_session, "session"), "authorization_required") == json_false()) {
Expand Down Expand Up @@ -2791,25 +2782,19 @@ static int check_auth_type_implicit_grant (const struct _u_request * request, st
}
json_decref(j_session);
} else {
// Empty scope is not allowed
response->status = 302;
redirect_url = msprintf("%s%serror=invalid_scope%s", u_map_get(request->map_url, "redirect_uri"), (o_strchr(u_map_get(request->map_url, "redirect_uri"), '?')!=NULL?"&":"?"), state_param);
// Redirect to login page
redirect_url = get_login_url(config, request, "auth", u_map_get(request->map_url, "client_id"), u_map_get(request->map_url, "scope"), NULL);
ulfius_add_header_to_response(response, "Location", redirect_url);
o_free(redirect_url);
response->status = 302;
}
} else {
// Redirect to login page
redirect_url = get_login_url(config, request, "auth", u_map_get(request->map_url, "client_id"), u_map_get(request->map_url, "scope"), NULL);
ulfius_add_header_to_response(response, "Location", redirect_url);
o_free(redirect_url);
response->status = 302;
// Empty scope is not allowed
response->status = 403;
}
} else {
// client is not authorized
response->status = 302;
redirect_url = msprintf("%s%serror=unauthorized_client%s%s", u_map_get(request->map_url, "redirect_uri"), (o_strchr(u_map_get(request->map_url, "redirect_uri"), '?')!=NULL?"&":"?"), (u_map_get(request->map_url, "state")!=NULL?"&state=":""), (u_map_get(request->map_url, "state")!=NULL?u_map_get(request->map_url, "state"):""));
ulfius_add_header_to_response(response, "Location", redirect_url);
o_free(redirect_url);
response->status = 403;
}
o_free(state_param);
json_decref(j_client);
Expand Down Expand Up @@ -3313,7 +3298,7 @@ static int callback_check_glewlwyd_session_or_token(const struct _u_request * re
static int callback_oauth2_authorization(const struct _u_request * request, struct _u_response * response, void * user_data) {
const char * response_type = u_map_get(request->map_url, "response_type");
int result = U_CALLBACK_CONTINUE;
char * redirect_url, * state_encoded = NULL, * state_param = NULL;
char * state_encoded = NULL, * state_param = NULL;

u_map_put(response->map_header, "Cache-Control", "no-store");
u_map_put(response->map_header, "Pragma", "no-cache");
Expand All @@ -3326,41 +3311,21 @@ static int callback_oauth2_authorization(const struct _u_request * request, stru
} else {
state_param = o_strdup("");
}

if (0 == o_strcmp("code", response_type)) {
if (is_authorization_type_enabled((struct _oauth2_config *)user_data, GLEWLWYD_AUTHORIZATION_TYPE_AUTHORIZATION_CODE) && u_map_get(request->map_url, "redirect_uri") != NULL) {
result = check_auth_type_auth_code_grant(request, response, user_data);
} else {
if (u_map_get(request->map_url, "redirect_uri") != NULL) {
response->status = 302;
redirect_url = msprintf("%s#error=unsupported_response_type%s", u_map_get(request->map_url, "redirect_uri"), state_param);
ulfius_add_header_to_response(response, "Location", redirect_url);
o_free(redirect_url);
} else {
response->status = 403;
}
response->status = 403;
}
} else if (0 == o_strcmp("token", response_type)) {
if (is_authorization_type_enabled((struct _oauth2_config *)user_data, GLEWLWYD_AUTHORIZATION_TYPE_IMPLICIT) && u_map_get(request->map_url, "redirect_uri") != NULL) {
result = check_auth_type_implicit_grant(request, response, user_data);
} else {
if (u_map_get(request->map_url, "redirect_uri") != NULL) {
response->status = 302;
redirect_url = msprintf("%s#error=unsupported_response_type%s", u_map_get(request->map_url, "redirect_uri"), state_param);
ulfius_add_header_to_response(response, "Location", redirect_url);
o_free(redirect_url);
} else {
response->status = 403;
}
}
} else {
if (u_map_get(request->map_url, "redirect_uri") != NULL) {
response->status = 302;
redirect_url = msprintf("%s#error=unsupported_response_type%s", u_map_get(request->map_url, "redirect_uri"), state_param);
ulfius_add_header_to_response(response, "Location", redirect_url);
o_free(redirect_url);
} else {
response->status = 403;
}
} else {
response->status = 403;
}
o_free(state_param);

Expand Down
47 changes: 43 additions & 4 deletions src/plugin/protocol_oidc.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3789,6 +3789,36 @@ static int is_authorization_type_enabled(struct _oidc_config * config, uint auth
return (authorization_type < 7)?config->auth_type_enabled[authorization_type]:0;
}

static int check_client_redirect_uri_valid(struct _oidc_config * config,
const char * client_id,
const char * redirect_uri,
const char * ip_source) {
json_t * j_client = config->glewlwyd_config->glewlwyd_plugin_callback_get_client(config->glewlwyd_config, client_id);
int uri_found = 0, ret;

if (check_result_value(j_client, G_OK) && json_object_get(json_object_get(j_client, "client"), "enabled") == json_true()) {
if (!o_strnullempty(redirect_uri)) {
if (json_array_has_string(json_object_get(json_object_get(j_client, "client"), "redirect_uri"), redirect_uri)) {
uri_found = 1;
} else {
uri_found = 0;
}
} else {
uri_found = 1;
}
if (!uri_found) {
y_log_message(Y_LOG_LEVEL_DEBUG, "check_client_redirect_uri_valid - oidc - Error, redirect_uri '%s' is invalid for the client '%s', origin: %s", redirect_uri, client_id, ip_source);
ret = G_ERROR_UNAUTHORIZED;
} else {
ret = G_OK;
}
} else {
ret = G_ERROR_UNAUTHORIZED;
}
json_decref(j_client);
return ret;
}

/**
* Verify if a client is valid without checking its secret
*/
Expand Down Expand Up @@ -14126,6 +14156,13 @@ static int callback_oidc_authorization(const struct _u_request * request, struct
response_mode = GLEWLWYD_RESPONSE_MODE_FRAGMENT;
}
}

if (!o_strnullempty(response_type) && check_client_redirect_uri_valid(config, client_id, redirect_uri, ip_source) != G_OK) {
y_log_message(Y_LOG_LEVEL_DEBUG, "callback_oidc_authorization - invlid client identified with redirect_uri");
response->status = 403;
break;
}

if (u_map_has_key(map, "response_mode")) {
str_response_mode = u_map_get(map, "response_mode");
if (0 == o_strcmp("query", str_response_mode)) {
Expand Down Expand Up @@ -14229,6 +14266,11 @@ static int callback_oidc_authorization(const struct _u_request * request, struct
login_hint = json_string_value(json_object_get(json_object_get(j_request, "request"), "login_hint"));
prompt = json_string_value(json_object_get(json_object_get(j_request, "request"), "prompt"));
max_age = json_string_value(json_object_get(json_object_get(j_request, "request"), "max_age"));
if (check_client_redirect_uri_valid(config, client_id, redirect_uri, ip_source) != G_OK) {
y_log_message(Y_LOG_LEVEL_DEBUG, "callback_oidc_authorization - invlid client identified with redirect_uri");
response->status = 403;
break;
}
if (code_challenge == NULL || request_par) {
code_challenge = json_string_value(json_object_get(json_object_get(j_request, "request"), "code_challenge"));
}
Expand Down Expand Up @@ -14473,10 +14515,7 @@ static int callback_oidc_authorization(const struct _u_request * request, struct

// Check if at least one scope has been provided
if (o_strnullempty(scope)) {
// Scope is not allowed for this user
y_log_message(Y_LOG_LEVEL_DEBUG, "oidc validate_endpoint_auth - scope list is missing or empty or scope 'openid' missing, origin: %s", ip_source);
u_map_put(&map_redirect, "error", "invalid_scope");
build_auth_response(config, response, response_mode, json_object_get(j_client, "client"), redirect_uri, &map_redirect);
response->status = 403;
break;
}

Expand Down

0 comments on commit 6f2d4a6

Please sign in to comment.