-
Notifications
You must be signed in to change notification settings - Fork 169
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.
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
mdb iamproxy auth support #561
Merged
Merged
Changes from all commits
Commits
Show all changes
30 commits
Select commit
Hold shift + click to select a range
1b15efe
add support of mdb-iamproxy authentication
b55ca49
remove some functions from mdb_iamproxy header file
326cbec
fix tabs in auth.c
fbfc91d
fix tabs in auth.c (2)
21e6a8d
fix tabs in sources
1013886
remove tabs from auth.c
8235874
do apply_fmt
c112585
do apply_fmt
87805b7
update rule.h/c files
0de5418
make apply fmt for rules
f13b86b
fix issues + rewrite way to communicate with socket
c3fa88f
make apply_fmt
ca7e086
fix issues (x4m)
b54d8af
fix issues (x4m)
e999899
make apply fmt
ab786bd
fix include lib name climits.h -> limits.h
dd00b23
fix issue
c6802fa
make apply_fmt
b7d4853
rewrite interaction with socket with machinarium library
fcf5272
make apply_fmt
56f0547
add more logging
d4a9a18
naming fix
aa37f9b
fix issues
cdb01da
rewrite auth.c and add new rules
8797fbc
fix issues; add new field in od_client_t; remove no_delay and keep_al…
4c52448
make apply_fmt
633b74e
remove external_username field from od_client_t; and add more fileds …
5264358
add logging subject_id
bf1f056
fix in log format
7a6afd4
fix logging format
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,250 @@ | ||
|
||
/* | ||
* Odyssey. | ||
* | ||
* Scalable PostgreSQL connection pooler. | ||
*/ | ||
|
||
#include <odyssey.h> | ||
#include <machinarium.h> | ||
#include <limits.h> | ||
#include <stdint.h> | ||
#include <malloc.h> | ||
#include <sys/poll.h> | ||
#include <sys/un.h> | ||
#include <sys/socket.h> | ||
|
||
/*CONNECTION CALLBACK TYPES*/ | ||
#define MDB_IAMPROXY_CONN_ERROR -1 | ||
#define MDB_IAMPROXY_CONN_TIMEOUT -1 | ||
AndrewOvvv marked this conversation as resolved.
Show resolved
Hide resolved
|
||
#define MDB_IAMPROXY_CONN_ACCEPTED 0 | ||
#define MDB_IAMPROXY_CONN_DENIED -1 | ||
|
||
#define MDB_IAMPROXY_RES_ERROR -1 | ||
#define MDB_IAMPROXY_RES_OK 0 | ||
|
||
/*AUTHENTICATION TIMEOUT LIMIT*/ | ||
#define MDB_IAMPROXY_DEFAULT_HEADER_SIZE 8 | ||
#define MDB_IAMPROXY_DEFAULT_CNT_CONNECTIONS 1 | ||
#define MDB_IAMPROXY_MAX_MSG_BODY_SIZE 1048576 // 1 Mb | ||
|
||
#define MDB_IAMPROXY_DEFAULT_CONNECTION_TIMEOUT 1000 | ||
#define MDB_IAMPROXY_DEFAULT_RECEIVING_HEADER_TIMEOUT 4000 | ||
#define MDB_IAMPROXY_DEFAULT_RECEIVING_BODY_TIMEOUT 1000 | ||
#define MDB_IAMPROXY_DEFAULT_SENDING_TIMEOUT 1000 | ||
|
||
/*PAM SOCKET FILE*/ | ||
#define MDB_IAMPROXY_DEFAULT_SOCKET_FILE \ | ||
"/var/run/iam-auth-proxy/iam-auth-proxy.sock" // PAM SOCKET FILE place | ||
|
||
void put_header(char dst[], uint64_t src) | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. let's mark these as static. |
||
{ | ||
for (int i = 0; i < MDB_IAMPROXY_DEFAULT_HEADER_SIZE; ++i) { | ||
dst[i] = (src & 0xFF); | ||
src >>= CHAR_BIT; | ||
} | ||
} | ||
|
||
void fetch_header(uint64_t *dst, char src[]) | ||
{ | ||
for (int i = 0; i < MDB_IAMPROXY_DEFAULT_HEADER_SIZE; ++i) { | ||
(*dst) |= (((uint64_t)src[i]) << (i * CHAR_BIT)); | ||
} | ||
} | ||
|
||
machine_msg_t *mdb_iamproxy_io_read(machine_io_t *io) | ||
{ | ||
machine_msg_t *header; | ||
machine_msg_t *msg; | ||
|
||
uint64_t body_size = 0; | ||
uint64_t received = 0; | ||
|
||
/* RECEIVE HEADER */ | ||
header = machine_read(io, MDB_IAMPROXY_DEFAULT_HEADER_SIZE, | ||
MDB_IAMPROXY_DEFAULT_RECEIVING_HEADER_TIMEOUT); | ||
if (header == NULL) { | ||
return NULL; | ||
} | ||
fetch_header(&body_size, (char *)machine_msg_data(header)); | ||
machine_msg_free(header); | ||
|
||
if (body_size > MDB_IAMPROXY_MAX_MSG_BODY_SIZE) { | ||
return NULL; | ||
} | ||
msg = machine_read(io, body_size, | ||
MDB_IAMPROXY_DEFAULT_RECEIVING_BODY_TIMEOUT); | ||
if (msg == NULL) { | ||
return NULL; | ||
} | ||
|
||
return msg; | ||
} | ||
|
||
int mdb_iamproxy_io_write(machine_io_t *io, machine_msg_t *msg) | ||
{ | ||
/*GET COMMON MSG INFO AND ALLOCATE BUFFER*/ | ||
int32_t send_result = MDB_IAMPROXY_RES_OK; | ||
uint64_t body_size = machine_msg_size( | ||
msg); // stores size of message (add one byte for 'c\0') | ||
|
||
/* PREPARE HEADER BUFFER */ | ||
machine_msg_t *header = | ||
machine_msg_create(MDB_IAMPROXY_DEFAULT_HEADER_SIZE); | ||
if (header == NULL) { | ||
send_result = MDB_IAMPROXY_RES_ERROR; | ||
goto free_end; | ||
AndrewOvvv marked this conversation as resolved.
Show resolved
Hide resolved
|
||
} | ||
put_header((char *)machine_msg_data(header), body_size); | ||
|
||
/*SEND HEADER TO SOCKET*/ | ||
if (machine_write(io, header, MDB_IAMPROXY_DEFAULT_SENDING_TIMEOUT) < | ||
0) { | ||
send_result = MDB_IAMPROXY_RES_ERROR; | ||
goto free_end; | ||
AndrewOvvv marked this conversation as resolved.
Show resolved
Hide resolved
|
||
} | ||
|
||
/*SEND MSG TO SOCKET*/ | ||
if (machine_write(io, msg, MDB_IAMPROXY_DEFAULT_SENDING_TIMEOUT) < 0) { | ||
send_result = MDB_IAMPROXY_RES_ERROR; | ||
goto free_end; | ||
} | ||
|
||
free_end: | ||
return send_result; | ||
} | ||
|
||
int mdb_iamproxy_authenticate_user(const char *username, const char *token, | ||
od_instance_t *instance, od_client_t *client) | ||
{ | ||
int32_t authentication_result = | ||
MDB_IAMPROXY_CONN_DENIED; // stores authenticate status for user (default value: CONN_DENIED) | ||
int32_t correct_sending = | ||
MDB_IAMPROXY_CONN_ACCEPTED; // stores stutus of sending data to iam-auth-proxy | ||
char *auth_status_char; | ||
machine_msg_t *msg_username = NULL, *msg_token = NULL, | ||
*auth_status = NULL, *external_user = NULL; | ||
|
||
/*SOCKET SETUP*/ | ||
struct sockaddr *saddr; | ||
AndrewOvvv marked this conversation as resolved.
Show resolved
Hide resolved
|
||
struct sockaddr_un | ||
exchange_socket; // socket for interprocceses connection | ||
memset(&exchange_socket, 0, sizeof(exchange_socket)); | ||
exchange_socket.sun_family = AF_UNIX; | ||
saddr = (struct sockaddr *)&exchange_socket; | ||
od_snprintf(exchange_socket.sun_path, sizeof(exchange_socket.sun_path), | ||
"%s", MDB_IAMPROXY_DEFAULT_SOCKET_FILE); | ||
AndrewOvvv marked this conversation as resolved.
Show resolved
Hide resolved
|
||
|
||
/*SETUP IO*/ | ||
machine_io_t *io; | ||
io = machine_io_create(); | ||
AndrewOvvv marked this conversation as resolved.
Show resolved
Hide resolved
|
||
if (io == NULL) { | ||
authentication_result = MDB_IAMPROXY_CONN_ERROR; | ||
goto free_end; | ||
} | ||
|
||
/*CONNECT TO SOCKET*/ | ||
int rc = machine_connect(io, saddr, | ||
MDB_IAMPROXY_DEFAULT_CONNECTION_TIMEOUT); | ||
if (rc == NOT_OK_RESPONSE) { | ||
od_error(&instance->logger, "auth", client, NULL, | ||
"failed to connect to %s", exchange_socket.sun_path); | ||
authentication_result = MDB_IAMPROXY_CONN_ERROR; | ||
goto free_end; | ||
} | ||
|
||
/*COMMUNICATE WITH SOCKET*/ | ||
msg_username = machine_msg_create(0); | ||
if (msg_username == NULL) { | ||
od_error(&instance->logger, "auth", client, NULL, | ||
"failed to allocate msg_username"); | ||
authentication_result = MDB_IAMPROXY_CONN_ERROR; | ||
goto free_io; | ||
} | ||
if (machine_msg_write(msg_username, username, strlen(username) + 1) < | ||
0) { | ||
od_error(&instance->logger, "auth", client, NULL, | ||
"failed to send username to msg_username"); | ||
authentication_result = MDB_IAMPROXY_CONN_ERROR; | ||
goto free_io; | ||
} | ||
|
||
msg_token = machine_msg_create(0); | ||
if (msg_token == NULL) { | ||
od_error(&instance->logger, "auth", client, NULL, | ||
"failed to allocate msg_token"); | ||
authentication_result = MDB_IAMPROXY_CONN_ERROR; | ||
goto free_io; | ||
} | ||
if (machine_msg_write(msg_token, token, strlen(token) + 1) < 0) { | ||
od_error(&instance->logger, "auth", client, NULL, | ||
"failed to write token to msg_token"); | ||
authentication_result = MDB_IAMPROXY_CONN_ERROR; | ||
goto free_io; | ||
} | ||
|
||
correct_sending = mdb_iamproxy_io_write( | ||
io, msg_username); // send USERNAME to socket | ||
if (correct_sending != | ||
MDB_IAMPROXY_RES_OK) { // error during sending data to socket | ||
od_error(&instance->logger, "auth", client, NULL, | ||
"failed to send username to iam-auth-proxy"); | ||
authentication_result = correct_sending; | ||
goto free_io; | ||
} | ||
correct_sending = | ||
mdb_iamproxy_io_write(io, msg_token); // send TOKEN to socket | ||
if (correct_sending != | ||
MDB_IAMPROXY_RES_OK) { // error during sending data to socket | ||
od_error(&instance->logger, "auth", client, NULL, | ||
"failed to send token to iam-auth-proxy"); | ||
authentication_result = MDB_IAMPROXY_CONN_ERROR; | ||
goto free_io; | ||
} | ||
|
||
/*COMMUNUCATE WITH SOCKET*/ | ||
auth_status = | ||
mdb_iamproxy_io_read(io); // recieve auth_status from socket | ||
if (auth_status == NULL) { // recieving is not completed successfully | ||
od_error(&instance->logger, "auth", client, NULL, | ||
"failed to receive auth_status from iam-auth-proxy"); | ||
authentication_result = MDB_IAMPROXY_CONN_ERROR; | ||
goto free_io; | ||
} | ||
|
||
auth_status_char = (char *)machine_msg_data(auth_status); | ||
if ((unsigned)auth_status_char[0]) { | ||
authentication_result = MDB_IAMPROXY_CONN_ACCEPTED; | ||
} else { | ||
authentication_result = MDB_IAMPROXY_CONN_DENIED; | ||
} | ||
|
||
external_user = | ||
mdb_iamproxy_io_read(io); // recieve subject_id from socket | ||
if (external_user == NULL) { | ||
od_error(&instance->logger, "auth", client, NULL, | ||
"failed to receive external_user from iam-auth-proxy"); | ||
authentication_result = MDB_IAMPROXY_CONN_ERROR; | ||
goto free_auth_status; | ||
} | ||
|
||
client->external_id = malloc(machine_msg_size(external_user)); | ||
memcpy(client->external_id, (char *)machine_msg_data(external_user), | ||
machine_msg_size(external_user)); | ||
|
||
od_log(&instance->logger, "auth", client, NULL, | ||
"user '%s.%s', with client_id: %s was authenticated by iam with subject_id: %s", | ||
client->startup.database.value, client->startup.user.value, | ||
client->id.id, client->external_id); | ||
|
||
/*FREE RESOURCES*/ | ||
free_external_user: | ||
machine_msg_free(external_user); | ||
free_auth_status: | ||
machine_msg_free(auth_status); | ||
free_io: | ||
machine_io_free(io); | ||
free_end: | ||
/*RETURN RESULT*/ | ||
return authentication_result; | ||
} |
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
let's avoid spurrious changes