adyxax/bastion
Archived
1
0
Fork 0
Code Issues Activity

Added address sanitization and fixed found bugs

Browse source
This commit is contained in:
Julien Dessaux 2018-08-23 14:07:58 +02:00
parent 5975503d88
commit 4da77dcb10
4 changed files with 16 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
GNUmakefile
View file

@ -1,5 +1,5 @@
CC=clang CC=clang
DEBUG=-g DEBUG=-g -fsanitize=address
CFLAGS= ${DEBUG} -Wall -Werror -Wextra -Weverything -Wno-disabled-macro-expansion CFLAGS= ${DEBUG} -Wall -Werror -Wextra -Weverything -Wno-disabled-macro-expansion
sources=$(wildcard src/*.c) sources=$(wildcard src/*.c)
@ -22,6 +22,12 @@ clean:
@sed -e 's/.*://' -e 's/\\$$//' < $*.d.tmp | fmt -1 | sed -e 's/^ *//' -e 's/$$/:/' >> $*.d @sed -e 's/.*://' -e 's/\\$$//' < $*.d.tmp | fmt -1 | sed -e 's/^ *//' -e 's/$$/:/' >> $*.d
@rm -f $*.d.tmp @rm -f $*.d.tmp
# You must compile without -fsanitize=address to use valgrind
valgrind: valgrind:
valgrind --leak-check=full --show-leak-kinds=all --trace-children=yes --suppressions=${HOME}/.valgrind_suppressions ./bastion valgrind --leak-check=full --show-leak-kinds=all --trace-children=yes --suppressions=${HOME}/.valgrind_suppressions ./bastion
#valgrind -v --leak-check=full --show-leak-kinds=all --trace-children=yes --suppressions=${HOME}/.valgrind_suppressions --gen-suppressions=yes ./bastion #valgrind -v --leak-check=full --show-leak-kinds=all --trace-children=yes --suppressions=${HOME}/.valgrind_suppressions --gen-suppressions=yes ./bastion
debug:
ASAN_OPTIONS=allow_user_segv_handler=true:detect_leaks=true:fast_unwind_on_malloc=0:check_initialization_order=1:suppressions=asan.supp \
ASAN_SYMBOLIZER_PATH=/usr/lib/llvm-6.0/bin/llvm-symbolizer \
./bastion

3
src/client.c
View file

@ -139,6 +139,7 @@ struct client_channel_data_struct* client_dial(ssh_event event, struct proxy_cha
} }
cdata->client_channel_cb = malloc(sizeof(*cdata->client_channel_cb)); cdata->client_channel_cb = malloc(sizeof(*cdata->client_channel_cb));
memset(cdata->client_channel_cb, 0, sizeof(*cdata->client_channel_cb));
cdata->client_channel_cb->userdata = cdata; cdata->client_channel_cb->userdata = cdata;
cdata->client_channel_cb->channel_data_function = client_data_function; cdata->client_channel_cb->channel_data_function = client_data_function;
cdata->client_channel_cb->channel_eof_function = client_channel_eof_callback; cdata->client_channel_cb->channel_eof_function = client_channel_eof_callback;
@ -160,7 +161,7 @@ struct client_channel_data_struct* client_dial(ssh_event event, struct proxy_cha
channel_clean: channel_clean:
ssh_channel_free(cdata->my_channel); ssh_channel_free(cdata->my_channel);
auth_clean: auth_clean:
// TODO // TODO when pubkey match implemented fix this
//pubkey_nomatch_clean: //pubkey_nomatch_clean:
ssh_string_free_char(hexa); ssh_string_free_char(hexa);
pubkey_hash_clean: pubkey_hash_clean:

21
src/proxy.c
View file

@ -104,7 +104,7 @@ static int proxy_subsystem_request(ssh_session session, ssh_channel channel,
(void) channel; (void) channel;
(void) subsystem; (void) subsystem;
(void) userdata; (void) userdata;
return SSH_ERROR; // TODO return SSH_ERROR; // TODO ssh subsystem request
//if (ssh_channel_is_open(pdata->client_channel)) { //if (ssh_channel_is_open(pdata->client_channel)) {
//} //}
} }
@ -190,21 +190,10 @@ void handle_proxy_session(ssh_event event, ssh_session session, ssh_channel my_c
.channel_pty_window_change_function = proxy_pty_resize, .channel_pty_window_change_function = proxy_pty_resize,
.channel_exec_request_function = proxy_exec_request, .channel_exec_request_function = proxy_exec_request,
.channel_subsystem_request_function = proxy_subsystem_request, .channel_subsystem_request_function = proxy_subsystem_request,
/** This function will be called when a client requests agent .channel_auth_agent_req_function = NULL,
* authentication forwarding. .channel_x11_req_function = NULL,
*/ .channel_env_request_function = NULL,
//ssh_channel_auth_agent_req_callback channel_auth_agent_req_function; .channel_write_wontblock_function = NULL,
/** This function will be called when a client requests X11
* forwarding.
*/
//ssh_channel_x11_req_callback channel_x11_req_function;
/** This function will be called when a client requests an environment
* variable to be set.
*/
/** This function will be called when the channel write is guaranteed
* not to block.
*/
// .channel_write_wontblock_function = proxy_channel_write_wontblock,
}; };
ssh_callbacks_init(&channel_cb); ssh_callbacks_init(&channel_cb);
ssh_set_channel_callbacks(my_channel, &channel_cb); ssh_set_channel_callbacks(my_channel, &channel_cb);

5
src/session.c
View file

@ -30,7 +30,7 @@ static int auth_pubkey(ssh_session session, const char *user,
// TODO check for an invite // TODO check for an invite
ssh_key reference_key = ssh_key_new(); ssh_key reference_key;
ssh_pki_import_pubkey_base64(USER_RSA_PUBKEY, SSH_KEYTYPE_RSA, &reference_key); // TODO fetch all pubkeys from db ssh_pki_import_pubkey_base64(USER_RSA_PUBKEY, SSH_KEYTYPE_RSA, &reference_key); // TODO fetch all pubkeys from db
if (!ssh_key_cmp(pubkey, reference_key, SSH_KEY_CMP_PUBLIC)) { if (!ssh_key_cmp(pubkey, reference_key, SSH_KEY_CMP_PUBLIC)) {
sdata->authenticated = 1; sdata->authenticated = 1;
@ -41,8 +41,7 @@ static int auth_pubkey(ssh_session session, const char *user,
return SSH_ERROR; return SSH_ERROR;
} }
sdata->login_username = malloc(len+1); sdata->login_username = malloc(len+1);
memset(sdata->login_username, 0, len+1); strncpy(sdata->login_username, user, len+1);
strncpy(sdata->login_username, user, len);
return SSH_AUTH_SUCCESS; return SSH_AUTH_SUCCESS;
} else { } else {
ssh_key_free(reference_key); ssh_key_free(reference_key);