dropbear: svr-session.c annotate

annotate svr-session.c @ 959:f92394f3f332

Merge pull request #2 from iquaba/patch-1 Try without identifying current user

author	Matt Johnston <matt@ucc.asn.au>
date	Wed, 06 Aug 2014 22:04:49 +0800
parents	e9dfb6d15193
children	f7f6c15b0ec3

rev	line source
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	1 /*
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	2 * Dropbear - a SSH2 server
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	3 *
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	4 * Copyright (c) 2002,2003 Matt Johnston
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	5 * All rights reserved.
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	6 *
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	7 * Permission is hereby granted, free of charge, to any person obtaining a copy
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	8 * of this software and associated documentation files (the "Software"), to deal
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	9 * in the Software without restriction, including without limitation the rights
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	10 * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	11 * copies of the Software, and to permit persons to whom the Software is
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	12 * furnished to do so, subject to the following conditions:
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	13 *
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	14 * The above copyright notice and this permission notice shall be included in
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	15 * all copies or substantial portions of the Software.
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	16 *
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	17 * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	18 * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	19 * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	20 * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	21 * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	22 * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	23 * SOFTWARE. */
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	24
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	25 #include "includes.h"
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	26 #include "session.h"
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	27 #include "dbutil.h"
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	28 #include "packet.h"
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	29 #include "algo.h"
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	30 #include "buffer.h"
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	31 #include "dss.h"
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	32 #include "ssh.h"
858 220f55d540ae rename random.h to dbrandom.h since some OSes have a system random.h Matt Johnston <matt@ucc.asn.au> parents: 801 diff changeset	33 #include "dbrandom.h"
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	34 #include "kex.h"
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	35 #include "channel.h"
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	36 #include "chansession.h"
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	37 #include "atomicio.h"
68 eee77ac31ccc cleaning up the pubkey defines Matt Johnston <matt@ucc.asn.au> parents: 62 diff changeset	38 #include "tcpfwd.h"
22 c1e5d9195402 merge of abac2150ee4f4031a98016241fbd136d24fed127 Matt Johnston <matt@ucc.asn.au> parents: 14 diff changeset	39 #include "service.h"
c1e5d9195402 merge of abac2150ee4f4031a98016241fbd136d24fed127 Matt Johnston <matt@ucc.asn.au> parents: 14 diff changeset	40 #include "auth.h"
24 469950e86d0f switching to global vars Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	41 #include "runopts.h"
766 d1575fdc29a6 start on ecdsa keys Matt Johnston <matt@ucc.asn.au> parents: 687 diff changeset	42 #include "crypto_desc.h"
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	43
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	44 static void svr_remoteclosed();
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	45
24 469950e86d0f switching to global vars Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	46 struct serversession svr_ses; /* GLOBAL */
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	47
22 c1e5d9195402 merge of abac2150ee4f4031a98016241fbd136d24fed127 Matt Johnston <matt@ucc.asn.au> parents: 14 diff changeset	48 static const packettype svr_packettypes[] = {
c1e5d9195402 merge of abac2150ee4f4031a98016241fbd136d24fed127 Matt Johnston <matt@ucc.asn.au> parents: 14 diff changeset	49 {SSH_MSG_CHANNEL_DATA, recv_msg_channel_data},
c1e5d9195402 merge of abac2150ee4f4031a98016241fbd136d24fed127 Matt Johnston <matt@ucc.asn.au> parents: 14 diff changeset	50 {SSH_MSG_CHANNEL_WINDOW_ADJUST, recv_msg_channel_window_adjust},
45 9ee8996a375f Pubkey auth is mostly there for the client. Something strange with Matt Johnston <matt@ucc.asn.au> parents: 35 diff changeset	51 {SSH_MSG_USERAUTH_REQUEST, recv_msg_userauth_request}, /* server */
9ee8996a375f Pubkey auth is mostly there for the client. Something strange with Matt Johnston <matt@ucc.asn.au> parents: 35 diff changeset	52 {SSH_MSG_SERVICE_REQUEST, recv_msg_service_request}, /* server */
9ee8996a375f Pubkey auth is mostly there for the client. Something strange with Matt Johnston <matt@ucc.asn.au> parents: 35 diff changeset	53 {SSH_MSG_KEXINIT, recv_msg_kexinit},
9ee8996a375f Pubkey auth is mostly there for the client. Something strange with Matt Johnston <matt@ucc.asn.au> parents: 35 diff changeset	54 {SSH_MSG_KEXDH_INIT, recv_msg_kexdh_init}, /* server */
9ee8996a375f Pubkey auth is mostly there for the client. Something strange with Matt Johnston <matt@ucc.asn.au> parents: 35 diff changeset	55 {SSH_MSG_NEWKEYS, recv_msg_newkeys},
22 c1e5d9195402 merge of abac2150ee4f4031a98016241fbd136d24fed127 Matt Johnston <matt@ucc.asn.au> parents: 14 diff changeset	56 {SSH_MSG_GLOBAL_REQUEST, recv_msg_global_request_remotetcp},
c1e5d9195402 merge of abac2150ee4f4031a98016241fbd136d24fed127 Matt Johnston <matt@ucc.asn.au> parents: 14 diff changeset	57 {SSH_MSG_CHANNEL_REQUEST, recv_msg_channel_request},
c1e5d9195402 merge of abac2150ee4f4031a98016241fbd136d24fed127 Matt Johnston <matt@ucc.asn.au> parents: 14 diff changeset	58 {SSH_MSG_CHANNEL_OPEN, recv_msg_channel_open},
c1e5d9195402 merge of abac2150ee4f4031a98016241fbd136d24fed127 Matt Johnston <matt@ucc.asn.au> parents: 14 diff changeset	59 {SSH_MSG_CHANNEL_EOF, recv_msg_channel_eof},
c1e5d9195402 merge of abac2150ee4f4031a98016241fbd136d24fed127 Matt Johnston <matt@ucc.asn.au> parents: 14 diff changeset	60 {SSH_MSG_CHANNEL_CLOSE, recv_msg_channel_close},
156 8c2b3506f112 Rearrange preprocessor parts so that compilation with various options Matt Johnston <matt@ucc.asn.au> parents: 98 diff changeset	61 #ifdef USING_LISTENERS
22 c1e5d9195402 merge of abac2150ee4f4031a98016241fbd136d24fed127 Matt Johnston <matt@ucc.asn.au> parents: 14 diff changeset	62 {SSH_MSG_CHANNEL_OPEN_CONFIRMATION, recv_msg_channel_open_confirmation},
c1e5d9195402 merge of abac2150ee4f4031a98016241fbd136d24fed127 Matt Johnston <matt@ucc.asn.au> parents: 14 diff changeset	63 {SSH_MSG_CHANNEL_OPEN_FAILURE, recv_msg_channel_open_failure},
156 8c2b3506f112 Rearrange preprocessor parts so that compilation with various options Matt Johnston <matt@ucc.asn.au> parents: 98 diff changeset	64 #endif
22 c1e5d9195402 merge of abac2150ee4f4031a98016241fbd136d24fed127 Matt Johnston <matt@ucc.asn.au> parents: 14 diff changeset	65 {0, 0} /* End */
c1e5d9195402 merge of abac2150ee4f4031a98016241fbd136d24fed127 Matt Johnston <matt@ucc.asn.au> parents: 14 diff changeset	66 };
c1e5d9195402 merge of abac2150ee4f4031a98016241fbd136d24fed127 Matt Johnston <matt@ucc.asn.au> parents: 14 diff changeset	67
c1e5d9195402 merge of abac2150ee4f4031a98016241fbd136d24fed127 Matt Johnston <matt@ucc.asn.au> parents: 14 diff changeset	68 static const struct ChanType *svr_chantypes[] = {
6 ab00ef513e97 Sorted out the first channel init issues. Matt Johnston <matt@ucc.asn.au> parents: 5 diff changeset	69 &svrchansess,
156 8c2b3506f112 Rearrange preprocessor parts so that compilation with various options Matt Johnston <matt@ucc.asn.au> parents: 98 diff changeset	70 #ifdef ENABLE_SVR_LOCALTCPFWD
62 20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: 45 diff changeset	71 &svr_chan_tcpdirect,
156 8c2b3506f112 Rearrange preprocessor parts so that compilation with various options Matt Johnston <matt@ucc.asn.au> parents: 98 diff changeset	72 #endif
6 ab00ef513e97 Sorted out the first channel init issues. Matt Johnston <matt@ucc.asn.au> parents: 5 diff changeset	73 NULL /* Null termination is mandatory. */
ab00ef513e97 Sorted out the first channel init issues. Matt Johnston <matt@ucc.asn.au> parents: 5 diff changeset	74 };
ab00ef513e97 Sorted out the first channel init issues. Matt Johnston <matt@ucc.asn.au> parents: 5 diff changeset	75
733 70811267715c Run the cleanup handler also when we close due to TCP connection being closed Matt Johnston <matt@ucc.asn.au> parents: 726 diff changeset	76 static void
70811267715c Run the cleanup handler also when we close due to TCP connection being closed Matt Johnston <matt@ucc.asn.au> parents: 726 diff changeset	77 svr_session_cleanup(void)
70811267715c Run the cleanup handler also when we close due to TCP connection being closed Matt Johnston <matt@ucc.asn.au> parents: 726 diff changeset	78 {
70811267715c Run the cleanup handler also when we close due to TCP connection being closed Matt Johnston <matt@ucc.asn.au> parents: 726 diff changeset	79 /* free potential public key options */
70811267715c Run the cleanup handler also when we close due to TCP connection being closed Matt Johnston <matt@ucc.asn.au> parents: 726 diff changeset	80 svr_pubkey_options_cleanup();
70811267715c Run the cleanup handler also when we close due to TCP connection being closed Matt Johnston <matt@ucc.asn.au> parents: 726 diff changeset	81 }
70811267715c Run the cleanup handler also when we close due to TCP connection being closed Matt Johnston <matt@ucc.asn.au> parents: 726 diff changeset	82
940 e9dfb6d15193 Fix auth timeout regression Matt Johnston <matt@ucc.asn.au> parents: 939 diff changeset	83 static void
e9dfb6d15193 Fix auth timeout regression Matt Johnston <matt@ucc.asn.au> parents: 939 diff changeset	84 svr_sessionloop() {
e9dfb6d15193 Fix auth timeout regression Matt Johnston <matt@ucc.asn.au> parents: 939 diff changeset	85 if (svr_ses.connect_time != 0
e9dfb6d15193 Fix auth timeout regression Matt Johnston <matt@ucc.asn.au> parents: 939 diff changeset	86 && monotonic_now() - svr_ses.connect_time >= AUTH_TIMEOUT) {
e9dfb6d15193 Fix auth timeout regression Matt Johnston <matt@ucc.asn.au> parents: 939 diff changeset	87 dropbear_close("Timeout before auth");
e9dfb6d15193 Fix auth timeout regression Matt Johnston <matt@ucc.asn.au> parents: 939 diff changeset	88 }
e9dfb6d15193 Fix auth timeout regression Matt Johnston <matt@ucc.asn.au> parents: 939 diff changeset	89 }
e9dfb6d15193 Fix auth timeout regression Matt Johnston <matt@ucc.asn.au> parents: 939 diff changeset	90
568 005530560594 Rearrange getaddrstring() etc Matt Johnston <matt@ucc.asn.au> parents: 553 diff changeset	91 void svr_session(int sock, int childpipe) {
005530560594 Rearrange getaddrstring() etc Matt Johnston <matt@ucc.asn.au> parents: 553 diff changeset	92 char host, port;
005530560594 Rearrange getaddrstring() etc Matt Johnston <matt@ucc.asn.au> parents: 553 diff changeset	93 size_t len;
272 3be7ae2e8dfa Only read /dev/random once when the program starts Matt Johnston <matt@ucc.asn.au> parents: 158 diff changeset	94
568 005530560594 Rearrange getaddrstring() etc Matt Johnston <matt@ucc.asn.au> parents: 553 diff changeset	95 common_session_init(sock, sock);
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	96
940 e9dfb6d15193 Fix auth timeout regression Matt Johnston <matt@ucc.asn.au> parents: 939 diff changeset	97 svr_ses.connect_time = monotonic_now();;
e9dfb6d15193 Fix auth timeout regression Matt Johnston <matt@ucc.asn.au> parents: 939 diff changeset	98
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	99 /* Initialise server specific parts of the session */
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	100 svr_ses.childpipe = childpipe;
667 fc7ae88e63b3 Rename HAVE_FORK to USE_VFORK Matt Johnston <matt@ucc.asn.au> parents: 666 diff changeset	101 #ifdef USE_VFORK
553 8711f20b89ab - For uclinux, only cleanup on exit for the main process. This avoids Matt Johnston <matt@ucc.asn.au> parents: 496 diff changeset	102 svr_ses.server_pid = getpid();
8711f20b89ab - For uclinux, only cleanup on exit for the main process. This avoids Matt Johnston <matt@ucc.asn.au> parents: 496 diff changeset	103 #endif
33 f789045062e6 Progressing client support Matt Johnston <matt@ucc.asn.au> parents: 26 diff changeset	104 svr_authinitialise();
22 c1e5d9195402 merge of abac2150ee4f4031a98016241fbd136d24fed127 Matt Johnston <matt@ucc.asn.au> parents: 14 diff changeset	105 chaninitialise(svr_chantypes);
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	106 svr_chansessinitialise();
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	107
568 005530560594 Rearrange getaddrstring() etc Matt Johnston <matt@ucc.asn.au> parents: 553 diff changeset	108 /* for logging the remote address */
005530560594 Rearrange getaddrstring() etc Matt Johnston <matt@ucc.asn.au> parents: 553 diff changeset	109 get_socket_address(ses.sock_in, NULL, NULL, &host, &port, 0);
005530560594 Rearrange getaddrstring() etc Matt Johnston <matt@ucc.asn.au> parents: 553 diff changeset	110 len = strlen(host) + strlen(port) + 2;
005530560594 Rearrange getaddrstring() etc Matt Johnston <matt@ucc.asn.au> parents: 553 diff changeset	111 svr_ses.addrstring = m_malloc(len);
005530560594 Rearrange getaddrstring() etc Matt Johnston <matt@ucc.asn.au> parents: 553 diff changeset	112 snprintf(svr_ses.addrstring, len, "%s:%s", host, port);
005530560594 Rearrange getaddrstring() etc Matt Johnston <matt@ucc.asn.au> parents: 553 diff changeset	113 m_free(host);
005530560594 Rearrange getaddrstring() etc Matt Johnston <matt@ucc.asn.au> parents: 553 diff changeset	114 m_free(port);
005530560594 Rearrange getaddrstring() etc Matt Johnston <matt@ucc.asn.au> parents: 553 diff changeset	115
572 8fd0ac8c8cab Move remotehost into svr_ses structure since we can't look it up Matt Johnston <matt@ucc.asn.au> parents: 568 diff changeset	116 get_socket_address(ses.sock_in, NULL, NULL,
8fd0ac8c8cab Move remotehost into svr_ses structure since we can't look it up Matt Johnston <matt@ucc.asn.au> parents: 568 diff changeset	117 &svr_ses.remotehost, NULL, 1);
8fd0ac8c8cab Move remotehost into svr_ses structure since we can't look it up Matt Johnston <matt@ucc.asn.au> parents: 568 diff changeset	118
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	119 /* set up messages etc */
33 f789045062e6 Progressing client support Matt Johnston <matt@ucc.asn.au> parents: 26 diff changeset	120 ses.remoteclosed = svr_remoteclosed;
733 70811267715c Run the cleanup handler also when we close due to TCP connection being closed Matt Johnston <matt@ucc.asn.au> parents: 726 diff changeset	121 ses.extra_session_cleanup = svr_session_cleanup;
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	122
22 c1e5d9195402 merge of abac2150ee4f4031a98016241fbd136d24fed127 Matt Johnston <matt@ucc.asn.au> parents: 14 diff changeset	123 /* packet handlers */
c1e5d9195402 merge of abac2150ee4f4031a98016241fbd136d24fed127 Matt Johnston <matt@ucc.asn.au> parents: 14 diff changeset	124 ses.packettypes = svr_packettypes;
c1e5d9195402 merge of abac2150ee4f4031a98016241fbd136d24fed127 Matt Johnston <matt@ucc.asn.au> parents: 14 diff changeset	125
35 0ad5fb979f42 set the isserver flag (oops) Matt Johnston <matt@ucc.asn.au> parents: 33 diff changeset	126 ses.isserver = 1;
0ad5fb979f42 set the isserver flag (oops) Matt Johnston <matt@ucc.asn.au> parents: 33 diff changeset	127
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	128 /* We're ready to go now */
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	129 sessinitdone = 1;
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	130
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	131 /* exchange identification, version etc */
726 78eda530c000 send out our kexinit packet before blocking to read the SSH version string Matt Johnston <matt@ucc.asn.au> parents: 687 diff changeset	132 send_session_identification();
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	133
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	134 /* start off with key exchange */
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	135 send_msg_kexinit();
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	136
26 0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 24 diff changeset	137 /* Run the main for loop. NULL is for the dispatcher - only the client
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 24 diff changeset	138 * code makes use of it */
940 e9dfb6d15193 Fix auth timeout regression Matt Johnston <matt@ucc.asn.au> parents: 939 diff changeset	139 session_loop(svr_sessionloop);
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	140
26 0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 24 diff changeset	141 /* Not reached */
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	142
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	143 }
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	144
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	145 /* failure exit - format must be <= 100 chars */
5 bc6477a6c393 syntactical fixups - it compiles, but channel handling code requires fixing. Matt Johnston <matt@ucc.asn.au> parents: 4 diff changeset	146 void svr_dropbear_exit(int exitcode, const char* format, va_list param) {
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	147
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	148 char fmtbuf[300];
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	149
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	150 if (!sessinitdone) {
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	151 /* before session init */
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	152 snprintf(fmtbuf, sizeof(fmtbuf),
876 5bfce5dcd461 Fix disabling DSS key Matt Johnston <matt@ucc.asn.au> parents: 858 diff changeset	153 "Early exit: %s", format);
33 f789045062e6 Progressing client support Matt Johnston <matt@ucc.asn.au> parents: 26 diff changeset	154 } else if (ses.authstate.authdone) {
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	155 /* user has authenticated */
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	156 snprintf(fmtbuf, sizeof(fmtbuf),
594 a98a2138364a Improve capitalisation for all logged strings Matt Johnston <matt@ucc.asn.au> parents: 572 diff changeset	157 "Exit (%s): %s",
464 4317be8b7cf9 Make a copy of passwd fields since getpwnam()'s retval isn't safe to keep Matt Johnston <matt@ucc.asn.au> parents: 454 diff changeset	158 ses.authstate.pw_name, format);
4317be8b7cf9 Make a copy of passwd fields since getpwnam()'s retval isn't safe to keep Matt Johnston <matt@ucc.asn.au> parents: 454 diff changeset	159 } else if (ses.authstate.pw_name) {
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	160 /* we have a potential user */
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	161 snprintf(fmtbuf, sizeof(fmtbuf),
594 a98a2138364a Improve capitalisation for all logged strings Matt Johnston <matt@ucc.asn.au> parents: 572 diff changeset	162 "Exit before auth (user '%s', %d fails): %s",
464 4317be8b7cf9 Make a copy of passwd fields since getpwnam()'s retval isn't safe to keep Matt Johnston <matt@ucc.asn.au> parents: 454 diff changeset	163 ses.authstate.pw_name, ses.authstate.failcount, format);
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	164 } else {
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	165 /* before userauth */
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	166 snprintf(fmtbuf, sizeof(fmtbuf),
594 a98a2138364a Improve capitalisation for all logged strings Matt Johnston <matt@ucc.asn.au> parents: 572 diff changeset	167 "Exit before auth: %s", format);
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	168 }
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	169
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	170 _dropbear_log(LOG_INFO, fmtbuf, param);
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	171
667 fc7ae88e63b3 Rename HAVE_FORK to USE_VFORK Matt Johnston <matt@ucc.asn.au> parents: 666 diff changeset	172 #ifdef USE_VFORK
fc7ae88e63b3 Rename HAVE_FORK to USE_VFORK Matt Johnston <matt@ucc.asn.au> parents: 666 diff changeset	173 /* For uclinux only the main server process should cleanup - we don't want
553 8711f20b89ab - For uclinux, only cleanup on exit for the main process. This avoids Matt Johnston <matt@ucc.asn.au> parents: 496 diff changeset	174 * forked children doing that */
8711f20b89ab - For uclinux, only cleanup on exit for the main process. This avoids Matt Johnston <matt@ucc.asn.au> parents: 496 diff changeset	175 if (svr_ses.server_pid == getpid())
8711f20b89ab - For uclinux, only cleanup on exit for the main process. This avoids Matt Johnston <matt@ucc.asn.au> parents: 496 diff changeset	176 #endif
8711f20b89ab - For uclinux, only cleanup on exit for the main process. This avoids Matt Johnston <matt@ucc.asn.au> parents: 496 diff changeset	177 {
8711f20b89ab - For uclinux, only cleanup on exit for the main process. This avoids Matt Johnston <matt@ucc.asn.au> parents: 496 diff changeset	178 /* must be after we've done with username etc */
733 70811267715c Run the cleanup handler also when we close due to TCP connection being closed Matt Johnston <matt@ucc.asn.au> parents: 726 diff changeset	179 session_cleanup();
553 8711f20b89ab - For uclinux, only cleanup on exit for the main process. This avoids Matt Johnston <matt@ucc.asn.au> parents: 496 diff changeset	180 }
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	181
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	182 exit(exitcode);
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	183
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	184 }
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	185
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	186 /* priority is priority as with syslog() */
5 bc6477a6c393 syntactical fixups - it compiles, but channel handling code requires fixing. Matt Johnston <matt@ucc.asn.au> parents: 4 diff changeset	187 void svr_dropbear_log(int priority, const char* format, va_list param) {
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	188
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	189 char printbuf[1024];
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	190 char datestr[20];
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	191 time_t timesec;
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	192 int havetrace = 0;
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	193
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	194 vsnprintf(printbuf, sizeof(printbuf), format, param);
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	195
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	196 #ifndef DISABLE_SYSLOG
24 469950e86d0f switching to global vars Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	197 if (svr_opts.usingsyslog) {
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	198 syslog(priority, "%s", printbuf);
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	199 }
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	200 #endif
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	201
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	202 /* if we are using DEBUG_TRACE, we want to print to stderr even if
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	203 * syslog is used, so it is included in error reports */
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	204 #ifdef DEBUG_TRACE
98 297167ef41bd Fix for printing out things with inetd mode when we have DEBUG_TRACE Matt Johnston <matt@ucc.asn.au> parents: 68 diff changeset	205 havetrace = debug_trace;
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	206 #endif
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	207
24 469950e86d0f switching to global vars Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	208 if (!svr_opts.usingsyslog \|\| havetrace)
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	209 {
404 a588558bfc94 Fix potential null pointer dereference found by Klokwork Matt Johnston <matt@ucc.asn.au> parents: 272 diff changeset	210 struct tm * local_tm = NULL;
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	211 timesec = time(NULL);
404 a588558bfc94 Fix potential null pointer dereference found by Klokwork Matt Johnston <matt@ucc.asn.au> parents: 272 diff changeset	212 local_tm = localtime(&timesec);
a588558bfc94 Fix potential null pointer dereference found by Klokwork Matt Johnston <matt@ucc.asn.au> parents: 272 diff changeset	213 if (local_tm == NULL
a588558bfc94 Fix potential null pointer dereference found by Klokwork Matt Johnston <matt@ucc.asn.au> parents: 272 diff changeset	214 \|\| strftime(datestr, sizeof(datestr), "%b %d %H:%M:%S",
618 b5cc8878d5ec Properly fix the bug found years ago by Klocwork, refound again. Matt Johnston <matt@ucc.asn.au> parents: 594 diff changeset	215 local_tm) == 0)
404 a588558bfc94 Fix potential null pointer dereference found by Klokwork Matt Johnston <matt@ucc.asn.au> parents: 272 diff changeset	216 {
433 c216212001fc Fix for -pedantic -ansi compilation, change // to /*/, plus some signedness Matt Johnston <matt@ucc.asn.au>* parents: 404 diff changeset	217 /* upon failure, just print the epoch-seconds time. */
479 e3db1f7a2e43 - Split main socket var into ses.sock_in/ses.sock_out in preparation Matt Johnston <matt@ucc.asn.au> parents: 464 diff changeset	218 snprintf(datestr, sizeof(datestr), "%d", (int)timesec);
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	219 }
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	220 fprintf(stderr, "[%d] %s %s\n", getpid(), datestr, printbuf);
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	221 }
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	222 }
5 bc6477a6c393 syntactical fixups - it compiles, but channel handling code requires fixing. Matt Johnston <matt@ucc.asn.au> parents: 4 diff changeset	223
bc6477a6c393 syntactical fixups - it compiles, but channel handling code requires fixing. Matt Johnston <matt@ucc.asn.au> parents: 4 diff changeset	224 /* called when the remote side closes the connection */
bc6477a6c393 syntactical fixups - it compiles, but channel handling code requires fixing. Matt Johnston <matt@ucc.asn.au> parents: 4 diff changeset	225 static void svr_remoteclosed() {
bc6477a6c393 syntactical fixups - it compiles, but channel handling code requires fixing. Matt Johnston <matt@ucc.asn.au> parents: 4 diff changeset	226
479 e3db1f7a2e43 - Split main socket var into ses.sock_in/ses.sock_out in preparation Matt Johnston <matt@ucc.asn.au> parents: 464 diff changeset	227 m_close(ses.sock_in);
e3db1f7a2e43 - Split main socket var into ses.sock_in/ses.sock_out in preparation Matt Johnston <matt@ucc.asn.au> parents: 464 diff changeset	228 m_close(ses.sock_out);
e3db1f7a2e43 - Split main socket var into ses.sock_in/ses.sock_out in preparation Matt Johnston <matt@ucc.asn.au> parents: 464 diff changeset	229 ses.sock_in = -1;
e3db1f7a2e43 - Split main socket var into ses.sock_in/ses.sock_out in preparation Matt Johnston <matt@ucc.asn.au> parents: 464 diff changeset	230 ses.sock_out = -1;
5 bc6477a6c393 syntactical fixups - it compiles, but channel handling code requires fixing. Matt Johnston <matt@ucc.asn.au> parents: 4 diff changeset	231 dropbear_close("Exited normally");
bc6477a6c393 syntactical fixups - it compiles, but channel handling code requires fixing. Matt Johnston <matt@ucc.asn.au> parents: 4 diff changeset	232
bc6477a6c393 syntactical fixups - it compiles, but channel handling code requires fixing. Matt Johnston <matt@ucc.asn.au> parents: 4 diff changeset	233 }
bc6477a6c393 syntactical fixups - it compiles, but channel handling code requires fixing. Matt Johnston <matt@ucc.asn.au> parents: 4 diff changeset	234

Mercurial > dropbear

annotate svr-session.c @ 959:f92394f3f332