-/* Copyright 2000-2004 Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+/* Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
/*
* htpasswd.c: simple program for manipulating password file for
* the Apache HTTP server
- *
+ *
* Originally by Rob McCool
*
* Exit values:
#define ALG_PLAIN 0
#define ALG_CRYPT 1
#define ALG_APMD5 2
-#define ALG_APSHA 3
+#define ALG_APSHA 3
#define ERR_FILEPERM 1
#define ERR_SYNTAX 2
apr_file_t *errfile;
apr_file_t *ftemp = NULL;
+#define NL APR_EOL_STR
+
+#if defined(WIN32) || defined(NETWARE)
+#define CRYPT_ALGO_SUPPORTED 0
+#else
+#define CRYPT_ALGO_SUPPORTED 1
+#endif
+
+#if CRYPT_ALGO_SUPPORTED
static void to64(char *s, unsigned long v, int n)
{
static unsigned char itoa64[] = /* 0 ... 63 => ASCII - 64 */
v >>= 6;
}
}
+#endif
+
+static void generate_salt(char *s, size_t size)
+{
+ static unsigned char tbl[] =
+ "./0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz";
+ size_t i;
+ for (i = 0; i < size; ++i) {
+ int idx = (int) (64.0 * rand() / (RAND_MAX + 1.0));
+ s[i] = tbl[idx];
+ }
+}
+
+static apr_status_t seed_rand(void)
+{
+ int seed = 0;
+ apr_status_t rv;
+ rv = apr_generate_random_bytes((unsigned char*) &seed, sizeof(seed));
+ if (rv) {
+ apr_file_printf(errfile, "Unable to generate random bytes: %pm" NL, &rv);
+ return rv;
+ }
+ srand(seed);
+ return rv;
+}
static void putline(apr_file_t *f, const char *l)
{
- apr_file_puts(l, f);
+ apr_status_t rc;
+ rc = apr_file_puts(l, f);
+ if (rc != APR_SUCCESS) {
+ char errstr[MAX_STRING_LEN];
+ apr_strerror(rc, errstr, MAX_STRING_LEN);
+ apr_file_printf(errfile, "Error writing temp file: %s" NL, errstr);
+ apr_file_close(f);
+ exit(ERR_FILEPERM);
+ }
}
/*
char pwv[MAX_STRING_LEN];
char salt[9];
apr_size_t bufsize;
+#if CRYPT_ALGO_SUPPORTED
+ char *cbuf;
+#endif
if (passwd != NULL) {
pw = passwd;
else {
bufsize = sizeof(pwin);
if (apr_password_get("New password: ", pwin, &bufsize) != 0) {
- apr_snprintf(record, (rlen - 1), "password too long (>%"
+ apr_snprintf(record, (rlen - 1), "password too long (>%"
APR_SIZE_T_FMT ")", sizeof(pwin) - 1);
return ERR_OVERFLOW;
}
apr_sha1_base64(pw,strlen(pw),cpw);
break;
- case ALG_APMD5:
- (void) srand((int) time((time_t *) NULL));
- to64(&salt[0], rand(), 8);
+ case ALG_APMD5:
+ if (seed_rand()) {
+ break;
+ }
+ generate_salt(&salt[0], 8);
salt[8] = '\0';
apr_md5_encode((const char *)pw, (const char *)salt,
apr_cpystrn(cpw,pw,sizeof(cpw));
break;
-#if !(defined(WIN32) || defined(NETWARE))
+#if CRYPT_ALGO_SUPPORTED
case ALG_CRYPT:
default:
- (void) srand((int) time((time_t *) NULL));
+ if (seed_rand()) {
+ break;
+ }
to64(&salt[0], rand(), 8);
salt[8] = '\0';
- apr_cpystrn(cpw, (char *)crypt(pw, salt), sizeof(cpw) - 1);
+ cbuf = crypt(pw, salt);
+ if (cbuf == NULL) {
+ char errbuf[128];
+
+ apr_snprintf(record, rlen-1, "crypt() failed: %s",
+ apr_strerror(errno, errbuf, sizeof errbuf));
+ return ERR_PWMISMATCH;
+ }
+
+ apr_cpystrn(cpw, cbuf, sizeof(cpw) - 1);
+ if (strlen(pw) > 8) {
+ char *truncpw = strdup(pw);
+ truncpw[8] = '\0';
+ if (!strcmp(cpw, crypt(truncpw, salt))) {
+ apr_file_printf(errfile, "Warning: Password truncated to 8 characters "
+ "by CRYPT algorithm." NL);
+ }
+ free(truncpw);
+ }
break;
-#endif
+#endif /* CRYPT_ALGO_SUPPORTED */
}
memset(pw, '\0', strlen(pw));
static void usage(void)
{
- apr_file_printf(errfile, "Usage:\n");
- apr_file_printf(errfile, "\thtpasswd [-cmdpsD] passwordfile username\n");
+ apr_file_printf(errfile, "Usage:" NL);
+ apr_file_printf(errfile, "\thtpasswd [-cmdpsD] passwordfile username" NL);
apr_file_printf(errfile, "\thtpasswd -b[cmdpsD] passwordfile username "
- "password\n\n");
- apr_file_printf(errfile, "\thtpasswd -n[mdps] username\n");
- apr_file_printf(errfile, "\thtpasswd -nb[mdps] username password\n");
- apr_file_printf(errfile, " -c Create a new file.\n");
+ "password" NL NL);
+ apr_file_printf(errfile, "\thtpasswd -n[mdps] username" NL);
+ apr_file_printf(errfile, "\thtpasswd -nb[mdps] username password" NL);
+ apr_file_printf(errfile, " -c Create a new file." NL);
apr_file_printf(errfile, " -n Don't update file; display results on "
- "stdout.\n");
+ "stdout." NL);
apr_file_printf(errfile, " -m Force MD5 encryption of the password"
-#if defined(WIN32) || defined(TPF) || defined(NETWARE)
" (default)"
-#endif
- ".\n");
+ "." NL);
apr_file_printf(errfile, " -d Force CRYPT encryption of the password"
-#if (!(defined(WIN32) || defined(TPF) || defined(NETWARE)))
- " (default)"
-#endif
- ".\n");
- apr_file_printf(errfile, " -p Do not encrypt the password (plaintext).\n");
- apr_file_printf(errfile, " -s Force SHA encryption of the password.\n");
+ "." NL);
+ apr_file_printf(errfile, " -p Do not encrypt the password (plaintext)." NL);
+ apr_file_printf(errfile, " -s Force SHA encryption of the password." NL);
apr_file_printf(errfile, " -b Use the password from the command line "
- "rather than prompting for it.\n");
- apr_file_printf(errfile, " -D Delete the specified user.\n");
+ "rather than prompting for it." NL);
+ apr_file_printf(errfile, " -D Delete the specified user." NL);
apr_file_printf(errfile,
- "On Windows, NetWare and TPF systems the '-m' flag is used by "
- "default.\n");
+ "On other systems than Windows and NetWare the '-p' flag will "
+ "probably not work." NL);
apr_file_printf(errfile,
- "On all other systems, the '-p' flag will probably not work.\n");
+ "The SHA algorithm does not use a salt and is less secure than "
+ "the MD5 algorithm." NL);
exit(ERR_SYNTAX);
}
return ((check || sbuf.filetype != APR_REG) ? 0 : 1);
}
-#ifdef NETWARE
-void nwTerminate()
+static void terminate(void)
{
+ apr_terminate();
+#ifdef NETWARE
pressanykey();
-}
#endif
+}
-static void check_args(apr_pool_t *pool, int argc, const char *const argv[],
- int *alg, int *mask, char **user, char **pwfilename,
+static void check_args(apr_pool_t *pool, int argc, const char *const argv[],
+ int *alg, int *mask, char **user, char **pwfilename,
char **password)
{
const char *arg;
/*
* Preliminary check to make sure they provided at least
- * three arguments, we'll do better argument checking as
+ * three arguments, we'll do better argument checking as
* we parse the command line.
*/
if (argc < 3) {
}
if ((*mask & APHTP_NEWFILE) && (*mask & APHTP_NOFILE)) {
- apr_file_printf(errfile, "%s: -c and -n options conflict\n", argv[0]);
+ apr_file_printf(errfile, "%s: -c and -n options conflict" NL, argv[0]);
exit(ERR_SYNTAX);
}
if ((*mask & APHTP_NEWFILE) && (*mask & APHTP_DELUSER)) {
- apr_file_printf(errfile, "%s: -c and -D options conflict\n", argv[0]);
+ apr_file_printf(errfile, "%s: -c and -D options conflict" NL, argv[0]);
exit(ERR_SYNTAX);
}
if ((*mask & APHTP_NOFILE) && (*mask & APHTP_DELUSER)) {
- apr_file_printf(errfile, "%s: -n and -D options conflict\n", argv[0]);
+ apr_file_printf(errfile, "%s: -n and -D options conflict" NL, argv[0]);
exit(ERR_SYNTAX);
}
/*
}
else {
if (strlen(argv[i]) > (APR_PATH_MAX - 1)) {
- apr_file_printf(errfile, "%s: filename too long\n", argv[0]);
+ apr_file_printf(errfile, "%s: filename too long" NL, argv[0]);
exit(ERR_OVERFLOW);
}
*pwfilename = apr_pstrdup(pool, argv[i]);
if (strlen(argv[i + 1]) > (MAX_STRING_LEN - 1)) {
- apr_file_printf(errfile, "%s: username too long (> %d)\n",
+ apr_file_printf(errfile, "%s: username too long (> %d)" NL,
argv[0], MAX_STRING_LEN - 1);
exit(ERR_OVERFLOW);
}
*user = apr_pstrdup(pool, argv[i + 1]);
if ((arg = strchr(*user, ':')) != NULL) {
apr_file_printf(errfile, "%s: username contains illegal "
- "character '%c'\n", argv[0], *arg);
+ "character '%c'" NL, argv[0], *arg);
exit(ERR_BADUSER);
}
if (*mask & APHTP_NONINTERACTIVE) {
if (strlen(argv[i + 2]) > (MAX_STRING_LEN - 1)) {
- apr_file_printf(errfile, "%s: password too long (> %d)\n",
+ apr_file_printf(errfile, "%s: password too long (> %d)" NL,
argv[0], MAX_STRING_LEN);
exit(ERR_OVERFLOW);
}
}
}
-static char *get_tempname(apr_pool_t *p)
-{
- char tn[] = "htpasswd.tmp.XXXXXX";
- char *dirname;
-
- if (!(dirname = getenv("TEMP")) && !(dirname = getenv("TMPDIR"))) {
- dirname = P_tmpdir;
- }
- dirname = apr_psprintf(p, "%s/%s", dirname, tn);
- return dirname;
-}
-
/*
* Let's do it. We end up doing a lot of file opening and closing,
* but what do we care? This application isn't run constantly.
char *password = NULL;
char *pwfilename = NULL;
char *user = NULL;
- char *tn;
- char scratch[MAX_STRING_LEN];
+ char tn[] = "htpasswd.tmp.XXXXXX";
+ char *dirname;
+ char *scratch, cp[MAX_STRING_LEN];
int found = 0;
int i;
- int alg = ALG_CRYPT;
+ int alg = ALG_APMD5;
int mask = 0;
apr_pool_t *pool;
int existing_file = 0;
#endif
apr_app_initialize(&argc, &argv, NULL);
- atexit(apr_terminate);
-#ifdef NETWARE
- atexit(nwTerminate);
-#endif
+ atexit(terminate);
apr_pool_create(&pool, NULL);
apr_file_open_stderr(&errfile, pool);
#if APR_CHARSET_EBCDIC
- rv = apr_xlate_open(&to_ascii, "ISO8859-1", APR_DEFAULT_CHARSET, pool);
+ rv = apr_xlate_open(&to_ascii, "ISO-8859-1", APR_DEFAULT_CHARSET, pool);
if (rv) {
- apr_file_printf(errfile, "apr_xlate_open(to ASCII)->%d\n", rv);
+ apr_file_printf(errfile, "apr_xlate_open(to ASCII)->%d" NL, rv);
exit(1);
}
rv = apr_SHA1InitEBCDIC(to_ascii);
if (rv) {
- apr_file_printf(errfile, "apr_SHA1InitEBCDIC()->%d\n", rv);
+ apr_file_printf(errfile, "apr_SHA1InitEBCDIC()->%d" NL, rv);
exit(1);
}
rv = apr_MD5InitEBCDIC(to_ascii);
if (rv) {
- apr_file_printf(errfile, "apr_MD5InitEBCDIC()->%d\n", rv);
+ apr_file_printf(errfile, "apr_MD5InitEBCDIC()->%d" NL, rv);
exit(1);
}
#endif /*APR_CHARSET_EBCDIC*/
check_args(pool, argc, argv, &alg, &mask, &user, &pwfilename, &password);
-#if defined(WIN32) || defined(NETWARE)
+#if !CRYPT_ALGO_SUPPORTED
if (alg == ALG_CRYPT) {
alg = ALG_APMD5;
- apr_file_printf(errfile, "Automatically using MD5 format.\n");
+ apr_file_printf(errfile, "Automatically using MD5 format." NL);
}
#endif
-#if (!(defined(WIN32) || defined(TPF) || defined(NETWARE)))
+#if CRYPT_ALGO_SUPPORTED
if (alg == ALG_PLAIN) {
apr_file_printf(errfile,"Warning: storing passwords as plain text "
- "might just not work on this platform.\n");
+ "might just not work on this platform." NL);
}
#endif
*/
if (!accessible(pool, pwfilename, APR_READ | APR_APPEND)) {
apr_file_printf(errfile, "%s: cannot open file %s for "
- "read/write access\n", argv[0], pwfilename);
+ "read/write access" NL, argv[0], pwfilename);
exit(ERR_FILEPERM);
}
}
*/
if (!(mask & APHTP_NEWFILE)) {
apr_file_printf(errfile,
- "%s: cannot modify file %s; use '-c' to create it\n",
+ "%s: cannot modify file %s; use '-c' to create it" NL,
argv[0], pwfilename);
exit(ERR_FILEPERM);
}
* As it doesn't exist yet, verify that we can create it.
*/
if (!accessible(pool, pwfilename, APR_CREATE | APR_WRITE)) {
- apr_file_printf(errfile, "%s: cannot create file %s\n",
+ apr_file_printf(errfile, "%s: cannot create file %s" NL,
argv[0], pwfilename);
exit(ERR_FILEPERM);
}
i = mkrecord(user, record, sizeof(record) - 1,
password, alg);
if (i != 0) {
- apr_file_printf(errfile, "%s: %s\n", argv[0], record);
+ apr_file_printf(errfile, "%s: %s" NL, argv[0], record);
exit(i);
}
if (mask & APHTP_NOFILE) {
- printf("%s\n", record);
+ printf("%s" NL, record);
exit(0);
}
}
* We can access the files the right way, and we have a record
* to add or update. Let's do it..
*/
- tn = get_tempname(pool);
- if (apr_file_mktemp(&ftemp, tn, 0, pool) != APR_SUCCESS) {
- apr_file_printf(errfile, "%s: unable to create temporary file %s\n",
- argv[0], tn);
+ if (apr_temp_dir_get((const char**)&dirname, pool) != APR_SUCCESS) {
+ apr_file_printf(errfile, "%s: could not determine temp dir" NL,
+ argv[0]);
+ exit(ERR_FILEPERM);
+ }
+ dirname = apr_psprintf(pool, "%s/%s", dirname, tn);
+
+ if (apr_file_mktemp(&ftemp, dirname, 0, pool) != APR_SUCCESS) {
+ apr_file_printf(errfile, "%s: unable to create temporary file %s" NL,
+ argv[0], dirname);
exit(ERR_FILEPERM);
}
if (existing_file && !(mask & APHTP_NEWFILE)) {
if (apr_file_open(&fpw, pwfilename, APR_READ | APR_BUFFERED,
APR_OS_DEFAULT, pool) != APR_SUCCESS) {
- apr_file_printf(errfile, "%s: unable to read file %s\n",
+ apr_file_printf(errfile, "%s: unable to read file %s" NL,
argv[0], pwfilename);
exit(ERR_FILEPERM);
}
while (apr_file_gets(line, sizeof(line), fpw) == APR_SUCCESS) {
char *colon;
- if ((line[0] == '#') || (line[0] == '\0')) {
+ strcpy(cp, line);
+ scratch = cp;
+ while (apr_isspace(*scratch)) {
+ ++scratch;
+ }
+
+ if (!*scratch || (*scratch == '#')) {
putline(ftemp, line);
continue;
}
- strcpy(scratch, line);
/*
* See if this is our user.
*/
}
else {
/*
- * If we've not got a colon on the line, this could well
+ * If we've not got a colon on the line, this could well
* not be a valid htpasswd file.
* We should bail at this point.
*/
- apr_file_printf(errfile, "\n%s: The file %s does not appear "
- "to be a valid htpasswd file.\n",
+ apr_file_printf(errfile, "%s: The file %s does not appear "
+ "to be a valid htpasswd file." NL,
argv[0], pwfilename);
apr_file_close(fpw);
exit(ERR_INVALID);
putline(ftemp, record);
}
else if (!found && (mask & APHTP_DELUSER)) {
- apr_file_printf(errfile, "User %s not found\n", user);
+ apr_file_printf(errfile, "User %s not found" NL, user);
exit(0);
}
- apr_file_printf(errfile, "password for user %s\n", user);
+ apr_file_printf(errfile, "password for user %s" NL, user);
/* The temporary file has all the data, just copy it to the new location.
*/
- if (apr_file_copy(tn, pwfilename, APR_FILE_SOURCE_PERMS, pool) !=
+ if (apr_file_copy(dirname, pwfilename, APR_FILE_SOURCE_PERMS, pool) !=
APR_SUCCESS) {
- apr_file_printf(errfile, "%s: unable to update file %s\n",
+ apr_file_printf(errfile, "%s: unable to update file %s" NL,
argv[0], pwfilename);
exit(ERR_FILEPERM);
}
projects / apache / blobdiff