hak5
/
openwrt-owl
mirror of https://github.com/hak5/openwrt-owl.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

dropbear: fix 100-pubkey_path.patch which broke pubkey auth after updating to 0.52 - thanks maniac103! 

SVN-Revision: 15144
owl
Jo-Philipp Wich 2009-04-07 23:04:29 +00:00
parent 591312eae7
commit 31a146b56d
2 changed files with 72 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package/dropbear/Makefile
View File

@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=dropbear PKG_NAME:=dropbear
PKG_VERSION:=0.52 PKG_VERSION:=0.52
PKG_RELEASE:=1 PKG_RELEASE:=2
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:= \ PKG_SOURCE_URL:= \

97
package/dropbear/patches/100-pubkey_path.patch
View File

@ -1,47 +1,92 @@
Index: dropbear-0.52/svr-authpubkey.c 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.orig/svr-authpubkey.c 2008-04-22 17:29:49.000000000 -0700 +++ dropbear-0.52/svr-authpubkey.c 2009-04-08 00:44:11.000000000 +0200
+++ dropbear-0.52/svr-authpubkey.c 2008-04-22 17:29:49.000000000 -0700 @@ -209,17 +209,21 @@
@@ -209,6 +209,8 @@
goto out; 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) { + 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);
+ +
/* we don't need to check pw and pw_dir for validity, since + /* open the file */
* its been done in checkpubkeyperms. */ + authfile = fopen(filename, "r");
len = strlen(ses.authstate.pw_dir);
@@ -220,6 +222,9 @@
/* open the file */
authfile = fopen(filename, "r");
+ } else { + } else {
+ authfile = fopen("/etc/dropbear/authorized_keys","r"); + authfile = fopen("/etc/dropbear/authorized_keys","r");
+ } + }
if (authfile == NULL) { if (authfile == NULL) {
goto out; goto out;
} }
@@ -372,6 +377,8 @@ @@ -372,26 +376,35 @@
goto out; goto out;
} }
+ if (ses.authstate.pw_uid != 0) { - /* allocate max required pathname storage,
+ - * = path + "/.ssh/authorized_keys" + '\0' = pathlen + 22 */
/* allocate max required pathname storage, - filename = m_malloc(len + 22);
* = path + "/.ssh/authorized_keys" + '\0' = pathlen + 22 */ - strncpy(filename, ses.authstate.pw_dir, len+1);
filename = m_malloc(len + 22); -
@@ -381,6 +388,14 @@ - /* check ~ */
if (checkfileperm(filename) != DROPBEAR_SUCCESS) { - if (checkfileperm(filename) != DROPBEAR_SUCCESS) {
goto out; - goto out;
} - }
+ } else { -
- /* 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) { + if (checkfileperm("/etc/dropbear") != DROPBEAR_SUCCESS) {
+ goto out; + goto out;
+ } + }
+ if (checkfileperm("/etc/dropbear/authorized_keys") != DROPBEAR_SUCCESS) { + if (checkfileperm("/etc/dropbear/authorized_keys") != DROPBEAR_SUCCESS) {
+ goto out; + 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;
+ }
}
/* check ~/.ssh */ /* file looks ok, return success */
strncat(filename, "/.ssh", 5); /* strlen("/.ssh") == 5 */