dropbear: svr-authpubkey.c annotate

annotate svr-authpubkey.c @ 1618:7bd7e95ad1f8

make writev #include consistent for variable declarations too

author	Matt Johnston <matt@ucc.asn.au>
date	Thu, 23 Aug 2018 23:59:24 +0800
parents	5d2d1021ca00
children	1fbe598a14fb

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. */
475 52a644e7b8e1 * Patch from Frédéric Moulins adding options to authorized_keys. Matt Johnston <matt@ucc.asn.au> parents: 464 diff changeset	24 /*
52a644e7b8e1 * Patch from Frédéric Moulins adding options to authorized_keys. Matt Johnston <matt@ucc.asn.au> parents: 464 diff changeset	25 * This file incorporates work covered by the following copyright and
52a644e7b8e1 * Patch from Frédéric Moulins adding options to authorized_keys. Matt Johnston <matt@ucc.asn.au> parents: 464 diff changeset	26 * permission notice:
52a644e7b8e1 * Patch from Frédéric Moulins adding options to authorized_keys. Matt Johnston <matt@ucc.asn.au> parents: 464 diff changeset	27 *
52a644e7b8e1 * Patch from Frédéric Moulins adding options to authorized_keys. Matt Johnston <matt@ucc.asn.au> parents: 464 diff changeset	28 * Copyright (c) 2000 Markus Friedl. All rights reserved.
52a644e7b8e1 * Patch from Frédéric Moulins adding options to authorized_keys. Matt Johnston <matt@ucc.asn.au> parents: 464 diff changeset	29 *
52a644e7b8e1 * Patch from Frédéric Moulins adding options to authorized_keys. Matt Johnston <matt@ucc.asn.au> parents: 464 diff changeset	30 * Redistribution and use in source and binary forms, with or without
52a644e7b8e1 * Patch from Frédéric Moulins adding options to authorized_keys. Matt Johnston <matt@ucc.asn.au> parents: 464 diff changeset	31 * modification, are permitted provided that the following conditions
52a644e7b8e1 * Patch from Frédéric Moulins adding options to authorized_keys. Matt Johnston <matt@ucc.asn.au> parents: 464 diff changeset	32 * are met:
52a644e7b8e1 * Patch from Frédéric Moulins adding options to authorized_keys. Matt Johnston <matt@ucc.asn.au> parents: 464 diff changeset	33 * 1. Redistributions of source code must retain the above copyright
52a644e7b8e1 * Patch from Frédéric Moulins adding options to authorized_keys. Matt Johnston <matt@ucc.asn.au> parents: 464 diff changeset	34 * notice, this list of conditions and the following disclaimer.
52a644e7b8e1 * Patch from Frédéric Moulins adding options to authorized_keys. Matt Johnston <matt@ucc.asn.au> parents: 464 diff changeset	35 * 2. Redistributions in binary form must reproduce the above copyright
52a644e7b8e1 * Patch from Frédéric Moulins adding options to authorized_keys. Matt Johnston <matt@ucc.asn.au> parents: 464 diff changeset	36 * notice, this list of conditions and the following disclaimer in the
52a644e7b8e1 * Patch from Frédéric Moulins adding options to authorized_keys. Matt Johnston <matt@ucc.asn.au> parents: 464 diff changeset	37 * documentation and/or other materials provided with the distribution.
52a644e7b8e1 * Patch from Frédéric Moulins adding options to authorized_keys. Matt Johnston <matt@ucc.asn.au> parents: 464 diff changeset	38 *
52a644e7b8e1 * Patch from Frédéric Moulins adding options to authorized_keys. Matt Johnston <matt@ucc.asn.au> parents: 464 diff changeset	39 * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
52a644e7b8e1 * Patch from Frédéric Moulins adding options to authorized_keys. Matt Johnston <matt@ucc.asn.au> parents: 464 diff changeset	40 * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
52a644e7b8e1 * Patch from Frédéric Moulins adding options to authorized_keys. Matt Johnston <matt@ucc.asn.au> parents: 464 diff changeset	41 * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
52a644e7b8e1 * Patch from Frédéric Moulins adding options to authorized_keys. Matt Johnston <matt@ucc.asn.au> parents: 464 diff changeset	42 * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
52a644e7b8e1 * Patch from Frédéric Moulins adding options to authorized_keys. Matt Johnston <matt@ucc.asn.au> parents: 464 diff changeset	43 * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
52a644e7b8e1 * Patch from Frédéric Moulins adding options to authorized_keys. Matt Johnston <matt@ucc.asn.au> parents: 464 diff changeset	44 * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
52a644e7b8e1 * Patch from Frédéric Moulins adding options to authorized_keys. Matt Johnston <matt@ucc.asn.au> parents: 464 diff changeset	45 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
52a644e7b8e1 * Patch from Frédéric Moulins adding options to authorized_keys. Matt Johnston <matt@ucc.asn.au> parents: 464 diff changeset	46 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
52a644e7b8e1 * Patch from Frédéric Moulins adding options to authorized_keys. Matt Johnston <matt@ucc.asn.au> parents: 464 diff changeset	47 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
52a644e7b8e1 * Patch from Frédéric Moulins adding options to authorized_keys. Matt Johnston <matt@ucc.asn.au> parents: 464 diff changeset	48 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
52a644e7b8e1 * Patch from Frédéric Moulins adding options to authorized_keys. Matt Johnston <matt@ucc.asn.au> parents: 464 diff changeset	49 *
52a644e7b8e1 * Patch from Frédéric Moulins adding options to authorized_keys. Matt Johnston <matt@ucc.asn.au> parents: 464 diff changeset	50 * This copyright and permission notice applies to the code parsing public keys
52a644e7b8e1 * Patch from Frédéric Moulins adding options to authorized_keys. Matt Johnston <matt@ucc.asn.au> parents: 464 diff changeset	51 * options string which can also be found in OpenSSH auth2-pubkey.c file
52a644e7b8e1 * Patch from Frédéric Moulins adding options to authorized_keys. Matt Johnston <matt@ucc.asn.au> parents: 464 diff changeset	52 * (user_key_allowed2). It has been adapted to work with buffers.
52a644e7b8e1 * Patch from Frédéric Moulins adding options to authorized_keys. Matt Johnston <matt@ucc.asn.au> parents: 464 diff changeset	53 *
52a644e7b8e1 * Patch from Frédéric Moulins adding options to authorized_keys. Matt Johnston <matt@ucc.asn.au> parents: 464 diff changeset	54 */
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	55
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	56 /* Process a pubkey auth request */
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	57
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	58 #include "includes.h"
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	59 #include "session.h"
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	60 #include "dbutil.h"
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	61 #include "buffer.h"
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	62 #include "signkey.h"
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	63 #include "auth.h"
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	64 #include "ssh.h"
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	65 #include "packet.h"
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	66 #include "algo.h"
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	67
1295 750ec4ec4cbe Convert #ifdef to #if, other build changes Matt Johnston <matt@ucc.asn.au> parents: 1276 diff changeset	68 #if DROPBEAR_SVR_PUBKEY_AUTH
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	69
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	70 #define MIN_AUTHKEYS_LINE 10 /* "ssh-rsa AB" - short but doesn't matter */
51 095d689fed16 - Hostkey checking is mostly there, just aren't appending yet. Matt Johnston <matt@ucc.asn.au> parents: 44 diff changeset	71 #define MAX_AUTHKEYS_LINE 4200 /* max length of a line in authkeys */
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	72
1459 06d52bcb8094 Pointer parameter could be declared as pointing to const Francois Perrad <francois.perrad@gadz.org> parents: 1422 diff changeset	73 static int checkpubkey(const char* algo, unsigned int algolen,
06d52bcb8094 Pointer parameter could be declared as pointing to const Francois Perrad <francois.perrad@gadz.org> parents: 1422 diff changeset	74 const unsigned char* keyblob, unsigned int keybloblen);
1276 9169e4e7cbee fix empty C prototypes Francois Perrad <francois.perrad@gadz.org> parents: 1122 diff changeset	75 static int checkpubkeyperms(void);
1459 06d52bcb8094 Pointer parameter could be declared as pointing to const Francois Perrad <francois.perrad@gadz.org> parents: 1422 diff changeset	76 static void send_msg_userauth_pk_ok(const char* algo, unsigned int algolen,
06d52bcb8094 Pointer parameter could be declared as pointing to const Francois Perrad <francois.perrad@gadz.org> parents: 1422 diff changeset	77 const unsigned char* keyblob, unsigned int keybloblen);
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	78 static int checkfileperm(char * filename);
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	79
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	80 /* process a pubkey auth request, sending success or failure message as
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	81 * appropriate */
1616 5d2d1021ca00 Wait to fail invalid usernames Matt Johnston <matt@ucc.asn.au> parents: 1500 diff changeset	82 void svr_auth_pubkey(int valid_user) {
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	83
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	84 unsigned char testkey; /* whether we're just checking if a key is usable */
1110 83025b7063ec Turn checkpubkey() and send_msg_userauth_pk_ok()'s algo argument into char * Gaël PORTAY <gael.portay@gmail.com> parents: 1094 diff changeset	85 char* algo = NULL; /* pubkey algo */
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	86 unsigned int algolen;
70 b0316ce64e4b Merging in the changes from 0.41-0.43 main Dropbear tree Matt Johnston <matt@ucc.asn.au> parents: 68 diff changeset	87 unsigned char* keyblob = NULL;
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	88 unsigned int keybloblen;
1059 703c7cdd2577 Fix pubkey auth after change to reuse ses.readbuf as ses.payload Matt Johnston <matt@ucc.asn.au> parents: 853 diff changeset	89 unsigned int sign_payload_length;
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	90 buffer * signbuf = NULL;
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	91 sign_key * key = NULL;
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	92 char* fp = NULL;
852 7540c0822374 Various cleanups and fixes for warnings Matt Johnston <matt@ucc.asn.au> parents: 762 diff changeset	93 enum signkey_type type = -1;
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	94
165 0cfba3034be5 Fixed DEBUG_TRACE macro so that we don't get semicolons left about the place Matt Johnston <matt@ucc.asn.au> parents: 158 diff changeset	95 TRACE(("enter pubkeyauth"))
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	96
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	97 /* 0 indicates user just wants to check if key can be used, 1 is an
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	98 * actual attempt*/
179 161557a9dde8 * fix longstanding bug with connections being closed on failure to Matt Johnston <matt@ucc.asn.au> parents: 165 diff changeset	99 testkey = (buf_getbool(ses.payload) == 0);
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	100
1122 aaf576b27a10 Merge pull request #13 from gazoo74/fix-warnings Matt Johnston <matt@ucc.asn.au> parents: 1110 diff changeset	101 algo = buf_getstring(ses.payload, &algolen);
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	102 keybloblen = buf_getint(ses.payload);
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	103 keyblob = buf_getptr(ses.payload, keybloblen);
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	104
1616 5d2d1021ca00 Wait to fail invalid usernames Matt Johnston <matt@ucc.asn.au> parents: 1500 diff changeset	105 if (!valid_user) {
5d2d1021ca00 Wait to fail invalid usernames Matt Johnston <matt@ucc.asn.au> parents: 1500 diff changeset	106 /* Return failure once we have read the contents of the packet
5d2d1021ca00 Wait to fail invalid usernames Matt Johnston <matt@ucc.asn.au> parents: 1500 diff changeset	107 required to validate a public key.
5d2d1021ca00 Wait to fail invalid usernames Matt Johnston <matt@ucc.asn.au> parents: 1500 diff changeset	108 Avoids blind user enumeration though it isn't possible to prevent
5d2d1021ca00 Wait to fail invalid usernames Matt Johnston <matt@ucc.asn.au> parents: 1500 diff changeset	109 testing for user existence if the public key is known */
5d2d1021ca00 Wait to fail invalid usernames Matt Johnston <matt@ucc.asn.au> parents: 1500 diff changeset	110 send_msg_userauth_failure(0, 0);
5d2d1021ca00 Wait to fail invalid usernames Matt Johnston <matt@ucc.asn.au> parents: 1500 diff changeset	111 goto out;
5d2d1021ca00 Wait to fail invalid usernames Matt Johnston <matt@ucc.asn.au> parents: 1500 diff changeset	112 }
5d2d1021ca00 Wait to fail invalid usernames Matt Johnston <matt@ucc.asn.au> parents: 1500 diff changeset	113
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	114 /* check if the key is valid */
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	115 if (checkpubkey(algo, algolen, keyblob, keybloblen) == DROPBEAR_FAILURE) {
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	116 send_msg_userauth_failure(0, 0);
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	117 goto out;
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	118 }
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	119
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	120 /* let them know that the key is ok to use */
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	121 if (testkey) {
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	122 send_msg_userauth_pk_ok(algo, algolen, keyblob, keybloblen);
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	123 goto out;
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	124 }
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	125
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	126 /* now we can actually verify the signature */
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	127
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	128 /* get the key */
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	129 key = new_sign_key();
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	130 type = DROPBEAR_SIGNKEY_ANY;
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	131 if (buf_get_pub_key(ses.payload, key, &type) == DROPBEAR_FAILURE) {
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	132 send_msg_userauth_failure(0, 1);
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	133 goto out;
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	134 }
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	135
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	136 /* create the data which has been signed - this a string containing
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	137 * session_id, concatenated with the payload packet up to the signature */
1059 703c7cdd2577 Fix pubkey auth after change to reuse ses.readbuf as ses.payload Matt Johnston <matt@ucc.asn.au> parents: 853 diff changeset	138 assert(ses.payload_beginning <= ses.payload->pos);
703c7cdd2577 Fix pubkey auth after change to reuse ses.readbuf as ses.payload Matt Johnston <matt@ucc.asn.au> parents: 853 diff changeset	139 sign_payload_length = ses.payload->pos - ses.payload_beginning;
762 a78a38e402d1 - Fix various hardcoded uses of SHA1 Matt Johnston <matt@ucc.asn.au> parents: 761 diff changeset	140 signbuf = buf_new(ses.payload->pos + 4 + ses.session_id->len);
761 ac2158e3e403 ecc kind of works, needs fixing/testing Matt Johnston <matt@ucc.asn.au> parents: 594 diff changeset	141 buf_putbufstring(signbuf, ses.session_id);
1059 703c7cdd2577 Fix pubkey auth after change to reuse ses.readbuf as ses.payload Matt Johnston <matt@ucc.asn.au> parents: 853 diff changeset	142
703c7cdd2577 Fix pubkey auth after change to reuse ses.readbuf as ses.payload Matt Johnston <matt@ucc.asn.au> parents: 853 diff changeset	143 /* The entire contents of the payload prior. */
703c7cdd2577 Fix pubkey auth after change to reuse ses.readbuf as ses.payload Matt Johnston <matt@ucc.asn.au> parents: 853 diff changeset	144 buf_setpos(ses.payload, ses.payload_beginning);
703c7cdd2577 Fix pubkey auth after change to reuse ses.readbuf as ses.payload Matt Johnston <matt@ucc.asn.au> parents: 853 diff changeset	145 buf_putbytes(signbuf,
703c7cdd2577 Fix pubkey auth after change to reuse ses.readbuf as ses.payload Matt Johnston <matt@ucc.asn.au> parents: 853 diff changeset	146 buf_getptr(ses.payload, sign_payload_length),
703c7cdd2577 Fix pubkey auth after change to reuse ses.readbuf as ses.payload Matt Johnston <matt@ucc.asn.au> parents: 853 diff changeset	147 sign_payload_length);
703c7cdd2577 Fix pubkey auth after change to reuse ses.readbuf as ses.payload Matt Johnston <matt@ucc.asn.au> parents: 853 diff changeset	148 buf_incrpos(ses.payload, sign_payload_length);
703c7cdd2577 Fix pubkey auth after change to reuse ses.readbuf as ses.payload Matt Johnston <matt@ucc.asn.au> parents: 853 diff changeset	149
44 45edf30ea0a6 Improved signkey code Matt Johnston <matt@ucc.asn.au> parents: 33 diff changeset	150 buf_setpos(signbuf, 0);
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	151
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	152 /* ... and finally verify the signature */
51 095d689fed16 - Hostkey checking is mostly there, just aren't appending yet. Matt Johnston <matt@ucc.asn.au> parents: 44 diff changeset	153 fp = sign_key_fingerprint(keyblob, keybloblen);
761 ac2158e3e403 ecc kind of works, needs fixing/testing Matt Johnston <matt@ucc.asn.au> parents: 594 diff changeset	154 if (buf_verify(ses.payload, key, signbuf) == DROPBEAR_SUCCESS) {
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	155 dropbear_log(LOG_NOTICE,
594 a98a2138364a Improve capitalisation for all logged strings Matt Johnston <matt@ucc.asn.au> parents: 476 diff changeset	156 "Pubkey auth succeeded for '%s' with key %s from %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: 436 diff changeset	157 ses.authstate.pw_name, fp, svr_ses.addrstring);
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	158 send_msg_userauth_success();
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	159 } else {
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	160 dropbear_log(LOG_WARNING,
594 a98a2138364a Improve capitalisation for all logged strings Matt Johnston <matt@ucc.asn.au> parents: 476 diff changeset	161 "Pubkey auth bad signature for '%s' with key %s from %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: 436 diff changeset	162 ses.authstate.pw_name, fp, svr_ses.addrstring);
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	163 send_msg_userauth_failure(0, 1);
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	164 }
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	165 m_free(fp);
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	166
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	167 out:
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	168 /* cleanup stuff */
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	169 if (signbuf) {
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	170 buf_free(signbuf);
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	171 }
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	172 if (algo) {
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	173 m_free(algo);
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	174 }
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	175 if (key) {
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	176 sign_key_free(key);
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	177 key = NULL;
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	178 }
165 0cfba3034be5 Fixed DEBUG_TRACE macro so that we don't get semicolons left about the place Matt Johnston <matt@ucc.asn.au> parents: 158 diff changeset	179 TRACE(("leave pubkeyauth"))
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	180 }
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 /* Reply that the key is valid for auth, this is sent when the user sends
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	183 * a straight copy of their pubkey to test, to avoid having to perform
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	184 * expensive signing operations with a worthless key */
1459 06d52bcb8094 Pointer parameter could be declared as pointing to const Francois Perrad <francois.perrad@gadz.org> parents: 1422 diff changeset	185 static void send_msg_userauth_pk_ok(const char* algo, unsigned int algolen,
06d52bcb8094 Pointer parameter could be declared as pointing to const Francois Perrad <francois.perrad@gadz.org> parents: 1422 diff changeset	186 const unsigned char* keyblob, unsigned int keybloblen) {
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	187
165 0cfba3034be5 Fixed DEBUG_TRACE macro so that we don't get semicolons left about the place Matt Johnston <matt@ucc.asn.au> parents: 158 diff changeset	188 TRACE(("enter send_msg_userauth_pk_ok"))
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	189 CHECKCLEARTOWRITE();
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	190
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	191 buf_putbyte(ses.writepayload, SSH_MSG_USERAUTH_PK_OK);
1122 aaf576b27a10 Merge pull request #13 from gazoo74/fix-warnings Matt Johnston <matt@ucc.asn.au> parents: 1110 diff changeset	192 buf_putstring(ses.writepayload, algo, algolen);
aaf576b27a10 Merge pull request #13 from gazoo74/fix-warnings Matt Johnston <matt@ucc.asn.au> parents: 1110 diff changeset	193 buf_putstring(ses.writepayload, (const char*)keyblob, keybloblen);
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	194
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	195 encrypt_packet();
165 0cfba3034be5 Fixed DEBUG_TRACE macro so that we don't get semicolons left about the place Matt Johnston <matt@ucc.asn.au> parents: 158 diff changeset	196 TRACE(("leave send_msg_userauth_pk_ok"))
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	197
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	198 }
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	199
1459 06d52bcb8094 Pointer parameter could be declared as pointing to const Francois Perrad <francois.perrad@gadz.org> parents: 1422 diff changeset	200 static int checkpubkey_line(buffer* line, int line_num, const char* filename,
1420 950c6973f27b split out checkpubkey_line() separately Matt Johnston <matt@ucc.asn.au> parents: 1342 diff changeset	201 const char* algo, unsigned int algolen,
950c6973f27b split out checkpubkey_line() separately Matt Johnston <matt@ucc.asn.au> parents: 1342 diff changeset	202 const unsigned char* keyblob, unsigned int keybloblen) {
950c6973f27b split out checkpubkey_line() separately Matt Johnston <matt@ucc.asn.au> parents: 1342 diff changeset	203 buffer *options_buf = NULL;
950c6973f27b split out checkpubkey_line() separately Matt Johnston <matt@ucc.asn.au> parents: 1342 diff changeset	204 unsigned int pos, len;
950c6973f27b split out checkpubkey_line() separately Matt Johnston <matt@ucc.asn.au> parents: 1342 diff changeset	205 int ret = DROPBEAR_FAILURE;
950c6973f27b split out checkpubkey_line() separately Matt Johnston <matt@ucc.asn.au> parents: 1342 diff changeset	206
1422 4cebe907dfd0 limit input size Matt Johnston <matt@ucc.asn.au> parents: 1421 diff changeset	207 if (line->len < MIN_AUTHKEYS_LINE \|\| line->len > MAX_AUTHKEYS_LINE) {
1452 15d4b821bcc9 fix checkpubkey_line function name for TRACE Matt Johnston <matt@ucc.asn.au> parents: 1451 diff changeset	208 TRACE(("checkpubkey_line: bad line length %d", line->len))
1422 4cebe907dfd0 limit input size Matt Johnston <matt@ucc.asn.au> parents: 1421 diff changeset	209 return DROPBEAR_FAILURE;
1420 950c6973f27b split out checkpubkey_line() separately Matt Johnston <matt@ucc.asn.au> parents: 1342 diff changeset	210 }
950c6973f27b split out checkpubkey_line() separately Matt Johnston <matt@ucc.asn.au> parents: 1342 diff changeset	211
1421 814f22d4a58f don't exit encountering short lines Matt Johnston <matt@ucc.asn.au> parents: 1420 diff changeset	212 /* compare the algorithm. +3 so we have enough bytes to read a space and some base64 characters too. */
814f22d4a58f don't exit encountering short lines Matt Johnston <matt@ucc.asn.au> parents: 1420 diff changeset	213 if (line->pos + algolen+3 > line->len) {
814f22d4a58f don't exit encountering short lines Matt Johnston <matt@ucc.asn.au> parents: 1420 diff changeset	214 goto out;
814f22d4a58f don't exit encountering short lines Matt Johnston <matt@ucc.asn.au> parents: 1420 diff changeset	215 }
1420 950c6973f27b split out checkpubkey_line() separately Matt Johnston <matt@ucc.asn.au> parents: 1342 diff changeset	216 /* check the key type */
950c6973f27b split out checkpubkey_line() separately Matt Johnston <matt@ucc.asn.au> parents: 1342 diff changeset	217 if (strncmp((const char *) buf_getptr(line, algolen), algo, algolen) != 0) {
950c6973f27b split out checkpubkey_line() separately Matt Johnston <matt@ucc.asn.au> parents: 1342 diff changeset	218 int is_comment = 0;
950c6973f27b split out checkpubkey_line() separately Matt Johnston <matt@ucc.asn.au> parents: 1342 diff changeset	219 unsigned char *options_start = NULL;
950c6973f27b split out checkpubkey_line() separately Matt Johnston <matt@ucc.asn.au> parents: 1342 diff changeset	220 int options_len = 0;
950c6973f27b split out checkpubkey_line() separately Matt Johnston <matt@ucc.asn.au> parents: 1342 diff changeset	221 int escape, quoted;
950c6973f27b split out checkpubkey_line() separately Matt Johnston <matt@ucc.asn.au> parents: 1342 diff changeset	222
950c6973f27b split out checkpubkey_line() separately Matt Johnston <matt@ucc.asn.au> parents: 1342 diff changeset	223 /* skip over any comments or leading whitespace */
950c6973f27b split out checkpubkey_line() separately Matt Johnston <matt@ucc.asn.au> parents: 1342 diff changeset	224 while (line->pos < line->len) {
950c6973f27b split out checkpubkey_line() separately Matt Johnston <matt@ucc.asn.au> parents: 1342 diff changeset	225 const char c = buf_getbyte(line);
950c6973f27b split out checkpubkey_line() separately Matt Johnston <matt@ucc.asn.au> parents: 1342 diff changeset	226 if (c == ' ' \|\| c == '\t') {
950c6973f27b split out checkpubkey_line() separately Matt Johnston <matt@ucc.asn.au> parents: 1342 diff changeset	227 continue;
950c6973f27b split out checkpubkey_line() separately Matt Johnston <matt@ucc.asn.au> parents: 1342 diff changeset	228 } else if (c == '#') {
950c6973f27b split out checkpubkey_line() separately Matt Johnston <matt@ucc.asn.au> parents: 1342 diff changeset	229 is_comment = 1;
950c6973f27b split out checkpubkey_line() separately Matt Johnston <matt@ucc.asn.au> parents: 1342 diff changeset	230 break;
950c6973f27b split out checkpubkey_line() separately Matt Johnston <matt@ucc.asn.au> parents: 1342 diff changeset	231 }
950c6973f27b split out checkpubkey_line() separately Matt Johnston <matt@ucc.asn.au> parents: 1342 diff changeset	232 buf_incrpos(line, -1);
950c6973f27b split out checkpubkey_line() separately Matt Johnston <matt@ucc.asn.au> parents: 1342 diff changeset	233 break;
950c6973f27b split out checkpubkey_line() separately Matt Johnston <matt@ucc.asn.au> parents: 1342 diff changeset	234 }
950c6973f27b split out checkpubkey_line() separately Matt Johnston <matt@ucc.asn.au> parents: 1342 diff changeset	235 if (is_comment) {
950c6973f27b split out checkpubkey_line() separately Matt Johnston <matt@ucc.asn.au> parents: 1342 diff changeset	236 /* next line */
950c6973f27b split out checkpubkey_line() separately Matt Johnston <matt@ucc.asn.au> parents: 1342 diff changeset	237 goto out;
950c6973f27b split out checkpubkey_line() separately Matt Johnston <matt@ucc.asn.au> parents: 1342 diff changeset	238 }
950c6973f27b split out checkpubkey_line() separately Matt Johnston <matt@ucc.asn.au> parents: 1342 diff changeset	239
950c6973f27b split out checkpubkey_line() separately Matt Johnston <matt@ucc.asn.au> parents: 1342 diff changeset	240 /* remember start of options */
950c6973f27b split out checkpubkey_line() separately Matt Johnston <matt@ucc.asn.au> parents: 1342 diff changeset	241 options_start = buf_getptr(line, 1);
950c6973f27b split out checkpubkey_line() separately Matt Johnston <matt@ucc.asn.au> parents: 1342 diff changeset	242 quoted = 0;
950c6973f27b split out checkpubkey_line() separately Matt Johnston <matt@ucc.asn.au> parents: 1342 diff changeset	243 escape = 0;
950c6973f27b split out checkpubkey_line() separately Matt Johnston <matt@ucc.asn.au> parents: 1342 diff changeset	244 options_len = 0;
950c6973f27b split out checkpubkey_line() separately Matt Johnston <matt@ucc.asn.au> parents: 1342 diff changeset	245
950c6973f27b split out checkpubkey_line() separately Matt Johnston <matt@ucc.asn.au> parents: 1342 diff changeset	246 /* figure out where the options are */
950c6973f27b split out checkpubkey_line() separately Matt Johnston <matt@ucc.asn.au> parents: 1342 diff changeset	247 while (line->pos < line->len) {
950c6973f27b split out checkpubkey_line() separately Matt Johnston <matt@ucc.asn.au> parents: 1342 diff changeset	248 const char c = buf_getbyte(line);
950c6973f27b split out checkpubkey_line() separately Matt Johnston <matt@ucc.asn.au> parents: 1342 diff changeset	249 if (!quoted && (c == ' ' \|\| c == '\t')) {
950c6973f27b split out checkpubkey_line() separately Matt Johnston <matt@ucc.asn.au> parents: 1342 diff changeset	250 break;
950c6973f27b split out checkpubkey_line() separately Matt Johnston <matt@ucc.asn.au> parents: 1342 diff changeset	251 }
950c6973f27b split out checkpubkey_line() separately Matt Johnston <matt@ucc.asn.au> parents: 1342 diff changeset	252 escape = (!escape && c == '\\');
950c6973f27b split out checkpubkey_line() separately Matt Johnston <matt@ucc.asn.au> parents: 1342 diff changeset	253 if (!escape && c == '"') {
950c6973f27b split out checkpubkey_line() separately Matt Johnston <matt@ucc.asn.au> parents: 1342 diff changeset	254 quoted = !quoted;
950c6973f27b split out checkpubkey_line() separately Matt Johnston <matt@ucc.asn.au> parents: 1342 diff changeset	255 }
950c6973f27b split out checkpubkey_line() separately Matt Johnston <matt@ucc.asn.au> parents: 1342 diff changeset	256 options_len++;
950c6973f27b split out checkpubkey_line() separately Matt Johnston <matt@ucc.asn.au> parents: 1342 diff changeset	257 }
950c6973f27b split out checkpubkey_line() separately Matt Johnston <matt@ucc.asn.au> parents: 1342 diff changeset	258 options_buf = buf_new(options_len);
950c6973f27b split out checkpubkey_line() separately Matt Johnston <matt@ucc.asn.au> parents: 1342 diff changeset	259 buf_putbytes(options_buf, options_start, options_len);
950c6973f27b split out checkpubkey_line() separately Matt Johnston <matt@ucc.asn.au> parents: 1342 diff changeset	260
950c6973f27b split out checkpubkey_line() separately Matt Johnston <matt@ucc.asn.au> parents: 1342 diff changeset	261 /* compare the algorithm. +3 so we have enough bytes to read a space and some base64 characters too. */
950c6973f27b split out checkpubkey_line() separately Matt Johnston <matt@ucc.asn.au> parents: 1342 diff changeset	262 if (line->pos + algolen+3 > line->len) {
950c6973f27b split out checkpubkey_line() separately Matt Johnston <matt@ucc.asn.au> parents: 1342 diff changeset	263 goto out;
950c6973f27b split out checkpubkey_line() separately Matt Johnston <matt@ucc.asn.au> parents: 1342 diff changeset	264 }
950c6973f27b split out checkpubkey_line() separately Matt Johnston <matt@ucc.asn.au> parents: 1342 diff changeset	265 if (strncmp((const char *) buf_getptr(line, algolen), algo, algolen) != 0) {
950c6973f27b split out checkpubkey_line() separately Matt Johnston <matt@ucc.asn.au> parents: 1342 diff changeset	266 goto out;
950c6973f27b split out checkpubkey_line() separately Matt Johnston <matt@ucc.asn.au> parents: 1342 diff changeset	267 }
950c6973f27b split out checkpubkey_line() separately Matt Johnston <matt@ucc.asn.au> parents: 1342 diff changeset	268 }
950c6973f27b split out checkpubkey_line() separately Matt Johnston <matt@ucc.asn.au> parents: 1342 diff changeset	269 buf_incrpos(line, algolen);
950c6973f27b split out checkpubkey_line() separately Matt Johnston <matt@ucc.asn.au> parents: 1342 diff changeset	270
950c6973f27b split out checkpubkey_line() separately Matt Johnston <matt@ucc.asn.au> parents: 1342 diff changeset	271 /* check for space (' ') character */
950c6973f27b split out checkpubkey_line() separately Matt Johnston <matt@ucc.asn.au> parents: 1342 diff changeset	272 if (buf_getbyte(line) != ' ') {
1452 15d4b821bcc9 fix checkpubkey_line function name for TRACE Matt Johnston <matt@ucc.asn.au> parents: 1451 diff changeset	273 TRACE(("checkpubkey_line: space character expected, isn't there"))
1420 950c6973f27b split out checkpubkey_line() separately Matt Johnston <matt@ucc.asn.au> parents: 1342 diff changeset	274 goto out;
950c6973f27b split out checkpubkey_line() separately Matt Johnston <matt@ucc.asn.au> parents: 1342 diff changeset	275 }
950c6973f27b split out checkpubkey_line() separately Matt Johnston <matt@ucc.asn.au> parents: 1342 diff changeset	276
950c6973f27b split out checkpubkey_line() separately Matt Johnston <matt@ucc.asn.au> parents: 1342 diff changeset	277 /* truncate the line at the space after the base64 data */
950c6973f27b split out checkpubkey_line() separately Matt Johnston <matt@ucc.asn.au> parents: 1342 diff changeset	278 pos = line->pos;
950c6973f27b split out checkpubkey_line() separately Matt Johnston <matt@ucc.asn.au> parents: 1342 diff changeset	279 for (len = 0; line->pos < line->len; len++) {
950c6973f27b split out checkpubkey_line() separately Matt Johnston <matt@ucc.asn.au> parents: 1342 diff changeset	280 if (buf_getbyte(line) == ' ') break;
950c6973f27b split out checkpubkey_line() separately Matt Johnston <matt@ucc.asn.au> parents: 1342 diff changeset	281 }
950c6973f27b split out checkpubkey_line() separately Matt Johnston <matt@ucc.asn.au> parents: 1342 diff changeset	282 buf_setpos(line, pos);
950c6973f27b split out checkpubkey_line() separately Matt Johnston <matt@ucc.asn.au> parents: 1342 diff changeset	283 buf_setlen(line, line->pos + len);
950c6973f27b split out checkpubkey_line() separately Matt Johnston <matt@ucc.asn.au> parents: 1342 diff changeset	284
1452 15d4b821bcc9 fix checkpubkey_line function name for TRACE Matt Johnston <matt@ucc.asn.au> parents: 1451 diff changeset	285 TRACE(("checkpubkey_line: line pos = %d len = %d", line->pos, line->len))
1420 950c6973f27b split out checkpubkey_line() separately Matt Johnston <matt@ucc.asn.au> parents: 1342 diff changeset	286
950c6973f27b split out checkpubkey_line() separately Matt Johnston <matt@ucc.asn.au> parents: 1342 diff changeset	287 ret = cmp_base64_key(keyblob, keybloblen, (const unsigned char *) algo, algolen, line, NULL);
950c6973f27b split out checkpubkey_line() separately Matt Johnston <matt@ucc.asn.au> parents: 1342 diff changeset	288
950c6973f27b split out checkpubkey_line() separately Matt Johnston <matt@ucc.asn.au> parents: 1342 diff changeset	289 if (ret == DROPBEAR_SUCCESS && options_buf) {
950c6973f27b split out checkpubkey_line() separately Matt Johnston <matt@ucc.asn.au> parents: 1342 diff changeset	290 ret = svr_add_pubkey_options(options_buf, line_num, filename);
950c6973f27b split out checkpubkey_line() separately Matt Johnston <matt@ucc.asn.au> parents: 1342 diff changeset	291 }
950c6973f27b split out checkpubkey_line() separately Matt Johnston <matt@ucc.asn.au> parents: 1342 diff changeset	292
950c6973f27b split out checkpubkey_line() separately Matt Johnston <matt@ucc.asn.au> parents: 1342 diff changeset	293 out:
950c6973f27b split out checkpubkey_line() separately Matt Johnston <matt@ucc.asn.au> parents: 1342 diff changeset	294 if (options_buf) {
950c6973f27b split out checkpubkey_line() separately Matt Johnston <matt@ucc.asn.au> parents: 1342 diff changeset	295 buf_free(options_buf);
950c6973f27b split out checkpubkey_line() separately Matt Johnston <matt@ucc.asn.au> parents: 1342 diff changeset	296 }
950c6973f27b split out checkpubkey_line() separately Matt Johnston <matt@ucc.asn.au> parents: 1342 diff changeset	297 return ret;
950c6973f27b split out checkpubkey_line() separately Matt Johnston <matt@ucc.asn.au> parents: 1342 diff changeset	298 }
950c6973f27b split out checkpubkey_line() separately Matt Johnston <matt@ucc.asn.au> parents: 1342 diff changeset	299
950c6973f27b split out checkpubkey_line() separately Matt Johnston <matt@ucc.asn.au> parents: 1342 diff changeset	300
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	301 /* Checks whether a specified publickey (and associated algorithm) is an
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	302 * acceptable key for authentication */
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	303 /* Returns DROPBEAR_SUCCESS if key is ok for auth, DROPBEAR_FAILURE otherwise */
1459 06d52bcb8094 Pointer parameter could be declared as pointing to const Francois Perrad <francois.perrad@gadz.org> parents: 1422 diff changeset	304 static int checkpubkey(const char* algo, unsigned int algolen,
06d52bcb8094 Pointer parameter could be declared as pointing to const Francois Perrad <francois.perrad@gadz.org> parents: 1422 diff changeset	305 const unsigned char* keyblob, unsigned int keybloblen) {
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	306
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	307 FILE * authfile = NULL;
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	308 char * filename = NULL;
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	309 int ret = DROPBEAR_FAILURE;
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	310 buffer * line = NULL;
1420 950c6973f27b split out checkpubkey_line() separately Matt Johnston <matt@ucc.asn.au> parents: 1342 diff changeset	311 unsigned int len;
476 df7f7da7f6e4 - Rework pubkey options to be more careful about buffer lengths. Needs review. Matt Johnston <matt@ucc.asn.au> parents: 475 diff changeset	312 int line_num;
1330 0d889b068123 switch user when opening authorized_keys Matt Johnston <matt@ucc.asn.au> parents: 1276 diff changeset	313 uid_t origuid;
0d889b068123 switch user when opening authorized_keys Matt Johnston <matt@ucc.asn.au> parents: 1276 diff changeset	314 gid_t origgid;
475 52a644e7b8e1 * Patch from Frédéric Moulins adding options to authorized_keys. Matt Johnston <matt@ucc.asn.au> parents: 464 diff changeset	315
165 0cfba3034be5 Fixed DEBUG_TRACE macro so that we don't get semicolons left about the place Matt Johnston <matt@ucc.asn.au> parents: 158 diff changeset	316 TRACE(("enter checkpubkey"))
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	317
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	318 /* check that we can use the algo */
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	319 if (have_algo(algo, algolen, sshhostkey) == DROPBEAR_FAILURE) {
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	320 dropbear_log(LOG_WARNING,
594 a98a2138364a Improve capitalisation for all logged strings Matt Johnston <matt@ucc.asn.au> parents: 476 diff changeset	321 "Pubkey auth attempt with unknown algo for '%s' from %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: 436 diff changeset	322 ses.authstate.pw_name, svr_ses.addrstring);
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	323 goto out;
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	324 }
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	325
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	326 /* check file permissions, also whether file exists */
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	327 if (checkpubkeyperms() == DROPBEAR_FAILURE) {
165 0cfba3034be5 Fixed DEBUG_TRACE macro so that we don't get semicolons left about the place Matt Johnston <matt@ucc.asn.au> parents: 158 diff changeset	328 TRACE(("bad authorized_keys permissions, or file doesn't exist"))
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	329 goto out;
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	330 }
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	331
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	332 /* we don't need to check pw and pw_dir for validity, since
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	333 * its been done in checkpubkeyperms. */
464 4317be8b7cf9 Make a copy of passwd fields since getpwnam()'s retval isn't safe to keep Matt Johnston <matt@ucc.asn.au> parents: 436 diff changeset	334 len = strlen(ses.authstate.pw_dir);
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	335 /* allocate max required pathname storage,
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	336 * = path + "/.ssh/authorized_keys" + '\0' = pathlen + 22 */
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	337 filename = m_malloc(len + 22);
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	338 snprintf(filename, len + 22, "%s/.ssh/authorized_keys",
464 4317be8b7cf9 Make a copy of passwd fields since getpwnam()'s retval isn't safe to keep Matt Johnston <matt@ucc.asn.au> parents: 436 diff changeset	339 ses.authstate.pw_dir);
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	340
1330 0d889b068123 switch user when opening authorized_keys Matt Johnston <matt@ucc.asn.au> parents: 1276 diff changeset	341 /* open the file as the authenticating user. */
0d889b068123 switch user when opening authorized_keys Matt Johnston <matt@ucc.asn.au> parents: 1276 diff changeset	342 origuid = getuid();
0d889b068123 switch user when opening authorized_keys Matt Johnston <matt@ucc.asn.au> parents: 1276 diff changeset	343 origgid = getgid();
0d889b068123 switch user when opening authorized_keys Matt Johnston <matt@ucc.asn.au> parents: 1276 diff changeset	344 if ((setegid(ses.authstate.pw_gid)) < 0 \|\|
0d889b068123 switch user when opening authorized_keys Matt Johnston <matt@ucc.asn.au> parents: 1276 diff changeset	345 (seteuid(ses.authstate.pw_uid)) < 0) {
0d889b068123 switch user when opening authorized_keys Matt Johnston <matt@ucc.asn.au> parents: 1276 diff changeset	346 dropbear_exit("Failed to set euid");
0d889b068123 switch user when opening authorized_keys Matt Johnston <matt@ucc.asn.au> parents: 1276 diff changeset	347 }
0d889b068123 switch user when opening authorized_keys Matt Johnston <matt@ucc.asn.au> parents: 1276 diff changeset	348
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	349 authfile = fopen(filename, "r");
1330 0d889b068123 switch user when opening authorized_keys Matt Johnston <matt@ucc.asn.au> parents: 1276 diff changeset	350
0d889b068123 switch user when opening authorized_keys Matt Johnston <matt@ucc.asn.au> parents: 1276 diff changeset	351 if ((seteuid(origuid)) < 0 \|\|
0d889b068123 switch user when opening authorized_keys Matt Johnston <matt@ucc.asn.au> parents: 1276 diff changeset	352 (setegid(origgid)) < 0) {
0d889b068123 switch user when opening authorized_keys Matt Johnston <matt@ucc.asn.au> parents: 1276 diff changeset	353 dropbear_exit("Failed to revert euid");
0d889b068123 switch user when opening authorized_keys Matt Johnston <matt@ucc.asn.au> parents: 1276 diff changeset	354 }
0d889b068123 switch user when opening authorized_keys Matt Johnston <matt@ucc.asn.au> parents: 1276 diff changeset	355
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	356 if (authfile == NULL) {
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	357 goto out;
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	358 }
165 0cfba3034be5 Fixed DEBUG_TRACE macro so that we don't get semicolons left about the place Matt Johnston <matt@ucc.asn.au> parents: 158 diff changeset	359 TRACE(("checkpubkey: opened authorized_keys OK"))
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	360
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	361 line = buf_new(MAX_AUTHKEYS_LINE);
476 df7f7da7f6e4 - Rework pubkey options to be more careful about buffer lengths. Needs review. Matt Johnston <matt@ucc.asn.au> parents: 475 diff changeset	362 line_num = 0;
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	363
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	364 /* iterate through the lines */
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	365 do {
51 095d689fed16 - Hostkey checking is mostly there, just aren't appending yet. Matt Johnston <matt@ucc.asn.au> parents: 44 diff changeset	366 if (buf_getline(line, authfile) == DROPBEAR_FAILURE) {
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	367 /* EOF reached */
165 0cfba3034be5 Fixed DEBUG_TRACE macro so that we don't get semicolons left about the place Matt Johnston <matt@ucc.asn.au> parents: 158 diff changeset	368 TRACE(("checkpubkey: authorized_keys EOF reached"))
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	369 break;
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	370 }
476 df7f7da7f6e4 - Rework pubkey options to be more careful about buffer lengths. Needs review. Matt Johnston <matt@ucc.asn.au> parents: 475 diff changeset	371 line_num++;
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	372
1451 7e95ab97d2b0 fix pubkey authentication return value Matt Johnston <matt@ucc.asn.au> parents: 1422 diff changeset	373 ret = checkpubkey_line(line, line_num, filename, algo, algolen, keyblob, keybloblen);
7e95ab97d2b0 fix pubkey authentication return value Matt Johnston <matt@ucc.asn.au> parents: 1422 diff changeset	374 if (ret == DROPBEAR_SUCCESS) {
51 095d689fed16 - Hostkey checking is mostly there, just aren't appending yet. Matt Johnston <matt@ucc.asn.au> parents: 44 diff changeset	375 break;
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	376 }
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	377
51 095d689fed16 - Hostkey checking is mostly there, just aren't appending yet. Matt Johnston <matt@ucc.asn.au> parents: 44 diff changeset	378 /* We continue to the next line otherwise */
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	379
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	380 } while (1);
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	381
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	382 out:
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	383 if (authfile) {
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	384 fclose(authfile);
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	385 }
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	386 if (line) {
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	387 buf_free(line);
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	388 }
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	389 m_free(filename);
165 0cfba3034be5 Fixed DEBUG_TRACE macro so that we don't get semicolons left about the place Matt Johnston <matt@ucc.asn.au> parents: 158 diff changeset	390 TRACE(("leave checkpubkey: ret=%d", ret))
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	391 return ret;
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	392 }
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	393
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	394
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	395 /* Returns DROPBEAR_SUCCESS if file permissions for pubkeys are ok,
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	396 * DROPBEAR_FAILURE otherwise.
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	397 * Checks that the user's homedir, ~/.ssh, and
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	398 * ~/.ssh/authorized_keys are all owned by either root or the user, and are
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	399 * g-w, o-w */
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	400 static int checkpubkeyperms() {
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	401
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	402 char* filename = NULL;
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	403 int ret = DROPBEAR_FAILURE;
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	404 unsigned int len;
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	405
165 0cfba3034be5 Fixed DEBUG_TRACE macro so that we don't get semicolons left about the place Matt Johnston <matt@ucc.asn.au> parents: 158 diff changeset	406 TRACE(("enter checkpubkeyperms"))
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	407
464 4317be8b7cf9 Make a copy of passwd fields since getpwnam()'s retval isn't safe to keep Matt Johnston <matt@ucc.asn.au> parents: 436 diff changeset	408 if (ses.authstate.pw_dir == NULL) {
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	409 goto out;
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	410 }
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	411
464 4317be8b7cf9 Make a copy of passwd fields since getpwnam()'s retval isn't safe to keep Matt Johnston <matt@ucc.asn.au> parents: 436 diff changeset	412 if ((len = strlen(ses.authstate.pw_dir)) == 0) {
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	413 goto out;
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	414 }
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	415
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	416 /* allocate max required pathname storage,
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	417 * = path + "/.ssh/authorized_keys" + '\0' = pathlen + 22 */
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	418 filename = m_malloc(len + 22);
464 4317be8b7cf9 Make a copy of passwd fields since getpwnam()'s retval isn't safe to keep Matt Johnston <matt@ucc.asn.au> parents: 436 diff changeset	419 strncpy(filename, ses.authstate.pw_dir, len+1);
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	420
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	421 /* check ~ */
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	422 if (checkfileperm(filename) != DROPBEAR_SUCCESS) {
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	423 goto out;
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	424 }
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	425
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	426 /* check ~/.ssh */
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	427 strncat(filename, "/.ssh", 5); /* strlen("/.ssh") == 5 */
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	428 if (checkfileperm(filename) != DROPBEAR_SUCCESS) {
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	429 goto out;
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	430 }
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	431
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	432 /* now check ~/.ssh/authorized_keys */
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	433 strncat(filename, "/authorized_keys", 16);
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	434 if (checkfileperm(filename) != DROPBEAR_SUCCESS) {
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	435 goto out;
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	436 }
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	437
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	438 /* file looks ok, return success */
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	439 ret = DROPBEAR_SUCCESS;
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	440
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	441 out:
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	442 m_free(filename);
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	443
165 0cfba3034be5 Fixed DEBUG_TRACE macro so that we don't get semicolons left about the place Matt Johnston <matt@ucc.asn.au> parents: 158 diff changeset	444 TRACE(("leave checkpubkeyperms"))
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	445 return ret;
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	446 }
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	447
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	448 /* Checks that a file is owned by the user or root, and isn't writable by
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	449 * group or other */
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	450 /* returns DROPBEAR_SUCCESS or DROPBEAR_FAILURE */
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	451 static int checkfileperm(char * filename) {
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	452 struct stat filestat;
248 bf64e666f99b Log when pubkey auth fails because of bad pubkey perms/ownership Matt Johnston <matt@ucc.asn.au> parents: 241 diff changeset	453 int badperm = 0;
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	454
165 0cfba3034be5 Fixed DEBUG_TRACE macro so that we don't get semicolons left about the place Matt Johnston <matt@ucc.asn.au> parents: 158 diff changeset	455 TRACE(("enter checkfileperm(%s)", filename))
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	456
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	457 if (stat(filename, &filestat) != 0) {
165 0cfba3034be5 Fixed DEBUG_TRACE macro so that we don't get semicolons left about the place Matt Johnston <matt@ucc.asn.au> parents: 158 diff changeset	458 TRACE(("leave checkfileperm: stat() != 0"))
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	459 return DROPBEAR_FAILURE;
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	460 }
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	461 /* check ownership - user or root only*/
464 4317be8b7cf9 Make a copy of passwd fields since getpwnam()'s retval isn't safe to keep Matt Johnston <matt@ucc.asn.au> parents: 436 diff changeset	462 if (filestat.st_uid != ses.authstate.pw_uid
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	463 && filestat.st_uid != 0) {
248 bf64e666f99b Log when pubkey auth fails because of bad pubkey perms/ownership Matt Johnston <matt@ucc.asn.au> parents: 241 diff changeset	464 badperm = 1;
bf64e666f99b Log when pubkey auth fails because of bad pubkey perms/ownership Matt Johnston <matt@ucc.asn.au> parents: 241 diff changeset	465 TRACE(("wrong ownership"))
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	466 }
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	467 /* check permissions - don't want group or others +w */
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	468 if (filestat.st_mode & (S_IWGRP \| S_IWOTH)) {
248 bf64e666f99b Log when pubkey auth fails because of bad pubkey perms/ownership Matt Johnston <matt@ucc.asn.au> parents: 241 diff changeset	469 badperm = 1;
bf64e666f99b Log when pubkey auth fails because of bad pubkey perms/ownership Matt Johnston <matt@ucc.asn.au> parents: 241 diff changeset	470 TRACE(("wrong perms"))
bf64e666f99b Log when pubkey auth fails because of bad pubkey perms/ownership Matt Johnston <matt@ucc.asn.au> parents: 241 diff changeset	471 }
bf64e666f99b Log when pubkey auth fails because of bad pubkey perms/ownership Matt Johnston <matt@ucc.asn.au> parents: 241 diff changeset	472 if (badperm) {
bf64e666f99b Log when pubkey auth fails because of bad pubkey perms/ownership Matt Johnston <matt@ucc.asn.au> parents: 241 diff changeset	473 if (!ses.authstate.perm_warn) {
bf64e666f99b Log when pubkey auth fails because of bad pubkey perms/ownership Matt Johnston <matt@ucc.asn.au> parents: 241 diff changeset	474 ses.authstate.perm_warn = 1;
bf64e666f99b Log when pubkey auth fails because of bad pubkey perms/ownership Matt Johnston <matt@ucc.asn.au> parents: 241 diff changeset	475 dropbear_log(LOG_INFO, "%s must be owned by user or root, and not writable by others", filename);
bf64e666f99b Log when pubkey auth fails because of bad pubkey perms/ownership Matt Johnston <matt@ucc.asn.au> parents: 241 diff changeset	476 }
bf64e666f99b Log when pubkey auth fails because of bad pubkey perms/ownership Matt Johnston <matt@ucc.asn.au> parents: 241 diff changeset	477 TRACE(("leave checkfileperm: failure perms/owner"))
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	478 return DROPBEAR_FAILURE;
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	479 }
248 bf64e666f99b Log when pubkey auth fails because of bad pubkey perms/ownership Matt Johnston <matt@ucc.asn.au> parents: 241 diff changeset	480
165 0cfba3034be5 Fixed DEBUG_TRACE macro so that we don't get semicolons left about the place Matt Johnston <matt@ucc.asn.au> parents: 158 diff changeset	481 TRACE(("leave checkfileperm: success"))
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	482 return DROPBEAR_SUCCESS;
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	483 }
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	484
475 52a644e7b8e1 * Patch from Frédéric Moulins adding options to authorized_keys. Matt Johnston <matt@ucc.asn.au> parents: 464 diff changeset	485 #endif

Mercurial > dropbear

annotate svr-authpubkey.c @ 1618:7bd7e95ad1f8