Changeset 55417bb in freewrt

Timestamp:

Jun 28, 2007, 7:48:27 PM (18 years ago)

Author:

Thorsten Glaser <tg@…>

Children:

116879b

Parents:

5986dbb

Message:

implement actually working password change code (without fwcf commit). Yay!

git-svn-id: ​svn://www.freewrt.org/trunk/freewrt@3014 afb5a338-a214-0410-bd46-81f09a774fd1

Location:

package/fwwif/src

Files:

• Makefile (modified) (1 diff)
• c_chpw.c (modified) (1 diff)
• chpw.ecpp (modified) (2 diffs)

package/fwwif/src/Makefile

@@ -30 +30 @@
 chpw.o c_chpw.o: c_chpw.h common.h
 md5.o md5hl.o: md5.h common.h
-md5crypt.o pwd_gensalt.o: md5crypt.h md5.h common.h
+md5crypt.o pwd_gensalt.o c_chpw.o: md5crypt.h md5.h common.h
 
 md5hl.c: helper.c

package/fwwif/src/c_chpw.c

@@ -23 +23 @@
  */
 
+#define _GNU_SOURCE
 #include "common.h"
+#include <errno.h>
 #include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
 #include "c_chpw.h"
+#include "md5crypt.h"
 
 int
 c_chpw(const char *oldpw, const char *newpw)
 {
-        fprintf(stdout, "test: oldpw=<%s>\n", oldpw);
-        fprintf(stderr, "test: newpw=<%s>\n", newpw);
-        return (1);
+        FILE *fi, *fo;
+        char *lp, *cp, *rootline = NULL, *adminline = NULL, *ap;
+        char salt[16];
+        size_t n;
+        int rv = 1;
+
+        if ((fi = fopen("/etc/passwd", "rb")) == NULL) {
+                printf("Error opening /etc/passwd for reading: %s\n",
+                    strerror(errno));
+                return (1);
+        }
+        if ((fo = fopen("/etc/passwd.new", "wb")) == NULL) {
+                printf("Error opening /etc/passwd.new for writing: %s\n",
+                    strerror(errno));
+                fclose(fi);
+                return (1);
+        }
+
+        lp = NULL;
+        while (getline(&lp, &n, fi) > 0) {
+                if ((cp = strchr(lp, '\n')))
+                        *cp = '\0';
+                if (!strncmp(lp, "root:", 5)) {
+                        if (rootline == NULL)
+                                rootline = strdup(lp);
+                } else if (!strncmp(lp, "admin:", 6)) {
+                        if (adminline == NULL)
+                                adminline = strdup(lp);
+                } else
+                        fprintf(fo, "%s\n", lp);
+        }
+        if (lp)
+                free(lp);
+        lp = NULL;
+
+        if (rootline == NULL) {
+                printf("No root account found!\n");
+                goto out;
+        }
+        lp = rootline + /* "root:" */ 5;
+        cp = strchr(lp, ':');
+        if (cp == NULL) {
+                printf("No root password found!\n");
+                goto out;
+        }
+        *cp++ = '\0';
+        rootline = cp;
+
+        /* lp = root password */
+        cp = md5crypt(oldpw, lp);
+        if (strcmp(cp, lp)) {
+                printf("root pw mismatch: '%s' != '%s'\n", cp, lp);
+                goto out;
+        }
+
+        /* we are authenticated, now change root and admin password */
+        if (!pwd_gensalt(salt, sizeof (salt)))
+                strlcpy(salt, lp, sizeof (salt));
+        cp = md5crypt(newpw, salt);
+        fprintf(fo, "root:%s:%s\n", cp, rootline);
+        if (adminline)
+                if ((ap = strchr(adminline + /* admin: */ 6, ':')) == NULL) {
+                        free(adminline);
+                        adminline = NULL;
+                }
+        fprintf(fo, "admin:%s:%s\n", cp, adminline ? ap + 1 :
+            "100:100:admin:/tmp:/bin/sh");
+
+        if (fclose(fo)) {
+                printf("Error closing new password file: %s\n",
+                    strerror(errno));
+                goto out;
+        }
+        fo = NULL;
+        fclose(fi);
+        fi = NULL;
+        if (rename("/etc/passwd", "/etc/passwd.old")) {
+                printf("Error renaming old password file: %s\n",
+                    strerror(errno));
+                goto out;
+        }
+        if (rename("/etc/passwd.new", "/etc/passwd")) {
+                printf("Error renaming new password file: %s\n",
+                    strerror(errno));
+                rename("/etc/passwd.old", "/etc/passwd");
+                goto out;
+        }
+        rv = 0;
+
+ out:
+        if (adminline)
+                free(adminline);
+        if (lp)
+                free(lp - /* "root:" */ 5);
+        if (fo) {
+                fclose(fo);
+                unlink("/etc/passwd.new");
+        }
+        if (fi)
+                fclose(fi);
+
+        return (rv);
 }

package/fwwif/src/chpw.ecpp

@@ -40 +40 @@
 </%cpp>
 <h1>Change Password</h1>
+<p>You can change the password for your FreeWRT box here. The old password
+ you must enter has to match against the current root password. The new
+ passwords must match each other and will set the new passwords for the
+ root user, the admin user <!-- and the web interface --> to their value.</p>
 <%cpp>
         } else if (newpw1 != newpw2) {
@@ -55 +59 @@
         if (i) {
 </%cpp>
-<form action="/chpw.htm" method="get">
+<form action="/chpw.htm" method="post">
 <table>
  <tr>