ClearML/dropbear
1
0
Fork 0
mirror of https://github.com/clearml/dropbear synced 2025-04-22 23:24:52 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fuzz: make postauth set authdone properly

Browse Source
This commit is contained in:
Matt Johnston 2020-12-03 22:18:51 +08:00
parent 286b6b9f80
commit 2c64335d9c
4 changed files with 22 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
fuzz-wrapfd.h
View File

@ -12,8 +12,8 @@ enum wrapfd_mode {
// buf is a common buffer read by all wrapped FDs. doesn't take ownership of buf // buf is a common buffer read by all wrapped FDs. doesn't take ownership of buf
void wrapfd_setup(buffer *buf); void wrapfd_setup(buffer *buf);
void wrapfd_setseed(uint32_t seed); void wrapfd_setseed(uint32_t seed);
int wrapfd_new_fuzzinput(); int wrapfd_new_fuzzinput(void);
int wrapfd_new_dummy(); int wrapfd_new_dummy(void);
// called via #defines for read/write/select // called via #defines for read/write/select
int wrapfd_read(int fd, void *out, size_t count); int wrapfd_read(int fd, void *out, size_t count);

5
fuzz.h
View File

@ -24,7 +24,7 @@ void fuzz_early_setup(void) __attribute__((constructor));
// returns DROPBEAR_SUCCESS or DROPBEAR_FAILURE // returns DROPBEAR_SUCCESS or DROPBEAR_FAILURE
int fuzz_set_input(const uint8_t *Data, size_t Size); int fuzz_set_input(const uint8_t *Data, size_t Size);
int fuzz_run_server(const uint8_t *Data, size_t Size, int skip_kexmaths, int authdone); int fuzz_run_server(const uint8_t *Data, size_t Size, int skip_kexmaths, int postauth);
int fuzz_run_client(const uint8_t *Data, size_t Size, int skip_kexmaths); int fuzz_run_client(const uint8_t *Data, size_t Size, int skip_kexmaths);
const void* fuzz_get_algo(const algo_type *algos, const char* name); const void* fuzz_get_algo(const algo_type *algos, const char* name);
@ -35,6 +35,7 @@ int fuzz_checkpubkey_line(buffer* line, int line_num, char* filename,
const unsigned char* keyblob, unsigned int keybloblen); const unsigned char* keyblob, unsigned int keybloblen);
extern const char * const * fuzz_signkey_names; extern const char * const * fuzz_signkey_names;
void fuzz_seed(const unsigned char* dat, unsigned int len); void fuzz_seed(const unsigned char* dat, unsigned int len);
void fuzz_svr_hook_preloop(void);
typedef void(*connect_callback)(int result, int sock, void* data, const char* errstring); typedef void(*connect_callback)(int result, int sock, void* data, const char* errstring);
struct dropbear_progress_connection *fuzz_connect_remote(const char* remotehost, const char* remoteport, struct dropbear_progress_connection *fuzz_connect_remote(const char* remotehost, const char* remoteport,
@ -68,6 +69,8 @@ struct dropbear_fuzz_options {
// whether to skip slow bignum maths // whether to skip slow bignum maths
int skip_kexmaths; int skip_kexmaths;
// whether is svr_postauth mode
int svr_postauth;
// dropbear_exit() jumps back // dropbear_exit() jumps back
int do_jmp; int do_jmp;

16
fuzz/fuzz-common.c
View File

@ -102,6 +102,13 @@ void fuzz_svr_setup(void) {
load_fixed_hostkeys(); load_fixed_hostkeys();
} }
void fuzz_svr_hook_preloop() {
if (fuzz.svr_postauth) {
ses.authstate.authdone = 1;
fill_passwd("root");
}
}
void fuzz_cli_setup(void) { void fuzz_cli_setup(void) {
fuzz_common_setup(); fuzz_common_setup();
@ -242,7 +249,7 @@ struct dropbear_progress_connection *fuzz_connect_remote(const char* UNUSED(remo
return NULL; return NULL;
} }
int fuzz_run_server(const uint8_t *Data, size_t Size, int skip_kexmaths, int authdone) { int fuzz_run_server(const uint8_t *Data, size_t Size, int skip_kexmaths, int postauth) {
static int once = 0; static int once = 0;
if (!once) { if (!once) {
fuzz_svr_setup(); fuzz_svr_setup();
@ -250,6 +257,8 @@ int fuzz_run_server(const uint8_t *Data, size_t Size, int skip_kexmaths, int aut
once = 1; once = 1;
} }
fuzz.svr_postauth = postauth;
if (fuzz_set_input(Data, Size) == DROPBEAR_FAILURE) { if (fuzz_set_input(Data, Size) == DROPBEAR_FAILURE) {
return 0; return 0;
} }
@ -260,11 +269,6 @@ int fuzz_run_server(const uint8_t *Data, size_t Size, int skip_kexmaths, int aut
int fakesock = wrapfd_new_fuzzinput(); int fakesock = wrapfd_new_fuzzinput();
if (authdone) {
ses.authstate.authdone = 1;
fill_passwd("root");
}
m_malloc_set_epoch(1); m_malloc_set_epoch(1);
fuzz.do_jmp = 1; fuzz.do_jmp = 1;
if (setjmp(fuzz.jmp) == 0) { if (setjmp(fuzz.jmp) == 0) {

6
svr-session.c
View File

@ -195,6 +195,12 @@ void svr_session(int sock, int childpipe) {
/* start off with key exchange */ /* start off with key exchange */
send_msg_kexinit(); send_msg_kexinit();
#if DROPBEAR_FUZZ
if (fuzz.fuzzing) {
fuzz_svr_hook_preloop();
}
#endif
/* Run the main for loop. NULL is for the dispatcher - only the client /* Run the main for loop. NULL is for the dispatcher - only the client
* code makes use of it */ * code makes use of it */
session_loop(svr_chansess_checksignal); session_loop(svr_chansess_checksignal);