| 1234567891011121314151617181920212223242526272829303132333435363738394041424344454647484950515253545556575859606162636465666768697071727374757677787980818283848586878889909192 |
- diff -ur dropbear-0.52.orig/svr-authpubkey.c dropbear-0.52/svr-authpubkey.c
- --- dropbear-0.52.orig/svr-authpubkey.c 2009-04-08 00:32:16.000000000 +0200
- +++ dropbear-0.52/svr-authpubkey.c 2009-04-08 00:44:11.000000000 +0200
- @@ -209,17 +209,21 @@
- goto out;
- }
-
- - /* we don't need to check pw and pw_dir for validity, since
- - * its been done in checkpubkeyperms. */
- - len = strlen(ses.authstate.pw_dir);
- - /* allocate max required pathname storage,
- - * = path + "/.ssh/authorized_keys" + '\0' = pathlen + 22 */
- - filename = m_malloc(len + 22);
- - snprintf(filename, len + 22, "%s/.ssh/authorized_keys",
- - ses.authstate.pw_dir);
- -
- - /* open the file */
- - authfile = fopen(filename, "r");
- + if (ses.authstate.pw_uid != 0) {
- + /* we don't need to check pw and pw_dir for validity, since
- + * its been done in checkpubkeyperms. */
- + len = strlen(ses.authstate.pw_dir);
- + /* allocate max required pathname storage,
- + * = path + "/.ssh/authorized_keys" + '\0' = pathlen + 22 */
- + filename = m_malloc(len + 22);
- + snprintf(filename, len + 22, "%s/.ssh/authorized_keys",
- + ses.authstate.pw_dir);
- +
- + /* open the file */
- + authfile = fopen(filename, "r");
- + } else {
- + authfile = fopen("/etc/dropbear/authorized_keys","r");
- + }
- if (authfile == NULL) {
- goto out;
- }
- @@ -372,26 +376,35 @@
- goto out;
- }
-
- - /* allocate max required pathname storage,
- - * = path + "/.ssh/authorized_keys" + '\0' = pathlen + 22 */
- - filename = m_malloc(len + 22);
- - strncpy(filename, ses.authstate.pw_dir, len+1);
- -
- - /* check ~ */
- - if (checkfileperm(filename) != DROPBEAR_SUCCESS) {
- - goto out;
- - }
- -
- - /* check ~/.ssh */
- - strncat(filename, "/.ssh", 5); /* strlen("/.ssh") == 5 */
- - if (checkfileperm(filename) != DROPBEAR_SUCCESS) {
- - goto out;
- - }
- -
- - /* now check ~/.ssh/authorized_keys */
- - strncat(filename, "/authorized_keys", 16);
- - if (checkfileperm(filename) != DROPBEAR_SUCCESS) {
- - goto out;
- + if (ses.authstate.pw_uid == 0) {
- + if (checkfileperm("/etc/dropbear") != DROPBEAR_SUCCESS) {
- + goto out;
- + }
- + if (checkfileperm("/etc/dropbear/authorized_keys") != DROPBEAR_SUCCESS) {
- + goto out;
- + }
- + } else {
- + /* allocate max required pathname storage,
- + * = path + "/.ssh/authorized_keys" + '\0' = pathlen + 22 */
- + filename = m_malloc(len + 22);
- + strncpy(filename, ses.authstate.pw_dir, len+1);
- +
- + /* check ~ */
- + if (checkfileperm(filename) != DROPBEAR_SUCCESS) {
- + goto out;
- + }
- +
- + /* check ~/.ssh */
- + strncat(filename, "/.ssh", 5); /* strlen("/.ssh") == 5 */
- + if (checkfileperm(filename) != DROPBEAR_SUCCESS) {
- + goto out;
- + }
- +
- + /* now check ~/.ssh/authorized_keys */
- + strncat(filename, "/authorized_keys", 16);
- + if (checkfileperm(filename) != DROPBEAR_SUCCESS) {
- + goto out;
- + }
- }
-
- /* file looks ok, return success */
|
