pgpool2.git / summary / log / commit / refs
commit aeec6ed5e9fe6f32c3a2a613e7374d30c89efc06
Author: Tatsuo Ishii <ishii at sraoss.co.jp>
Date: Sun Jun 27 23:18:11 2010 +0000
Forgot to add pool_passwd.c pool_passwd.h.
Modulaize pool_passwd update function.
pg_md5.c | 82 ++++++++++-----------
pool_passwd.c | 226 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
pool_passwd.h | 40 +++++++++++
3 files changed, 302 insertions(+), 46 deletions(-)
diff --git a/pg_md5.c b/pg_md5.c
index 3e88aab44..b0c4eed4f 100644
--- a/pg_md5.c
+++ b/pg_md5.c
@@ -43,6 +43,7 @@
static void print_usage(const char prog[], int exit_code);
static void set_tio_attr(int enable);
+static void update_pool_passwd(char *conf_file, char *password);
int
main(int argc, char *argv[])
@@ -50,7 +51,6 @@ main(int argc, char *argv[])
#define PRINT_USAGE(exit_code) print_usage(argv[0], exit_code)
char conf_file[POOLMAXPATHLEN+1];
- char pool_passwd[POOLMAXPATHLEN+1];
int opt;
int optindex;
bool md5auth = false;
@@ -123,27 +123,13 @@ main(int argc, char *argv[])
if (md5auth)
{
- struct passwd *pw;
-
- if (pool_init_config())
- {
- fprintf(stderr, "pool_init_config() failed\n\n");
- PRINT_USAGE(EXIT_FAILURE);
- }
-
- pw = getpwuid(geteuid());
- if (!pw)
- {
- fprintf(stderr, "getpwuid() failed\n\n");
- exit(EXIT_FAILURE);
- }
- pool_md5_encrypt(buf, pw->pw_name, strlen(pw->pw_name), md5);
+ update_pool_passwd(conf_file, buf);
}
else
{
pool_md5_hash(buf, len, md5);
+ printf("%s\n", md5);
}
- printf("\n%s\n", md5);
}
/* Read password from argv. */
@@ -167,45 +153,49 @@ main(int argc, char *argv[])
if (md5auth)
{
- struct passwd *pw;
-
- if (pool_init_config())
- {
- fprintf(stderr, "pool_init_config() failed\n\n");
- PRINT_USAGE(EXIT_FAILURE);
- }
- if (pool_get_config(conf_file, INIT_CONFIG))
- {
- fprintf(stderr, "Unable to get configuration. Exiting...");
- PRINT_USAGE(EXIT_FAILURE);
- }
-
- snprintf(pool_passwd, sizeof(pool_passwd), "%s/%s",
- dirname(conf_file), pool_config->pool_passwd);
- pool_init_pool_passwd(pool_passwd);
-
- pw = getpwuid(geteuid());
- if (!pw)
- {
- fprintf(stderr, "getpwuid() failed\n\n");
- exit(EXIT_FAILURE);
- }
- pg_md5_encrypt(argv[optind], pw->pw_name, strlen(pw->pw_name), md5);
- pool_create_passwdent(pw->pw_name, md5);
- fprintf(stderr, "%s\n", pool_get_passwd(pw->pw_name));
- pool_finish_pool_passwd();
+ update_pool_passwd(conf_file, argv[optind]);
}
else
{
pool_md5_hash(argv[optind], len, md5);
+ printf("%s\n", md5);
}
-
- printf("%s\n", md5);
}
return EXIT_SUCCESS;
}
+static void update_pool_passwd(char *conf_file, char *password)
+{
+ struct passwd *pw;
+ char md5[MD5_PASSWD_LEN+1];
+ char pool_passwd[POOLMAXPATHLEN+1];
+
+ if (pool_init_config())
+ {
+ fprintf(stderr, "pool_init_config() failed\n\n");
+ exit(EXIT_FAILURE);
+ }
+ if (pool_get_config(conf_file, INIT_CONFIG))
+ {
+ fprintf(stderr, "Unable to get configuration. Exiting...");
+ exit(EXIT_FAILURE);
+ }
+
+ snprintf(pool_passwd, sizeof(pool_passwd), "%s/%s",
+ dirname(conf_file), pool_config->pool_passwd);
+ pool_init_pool_passwd(pool_passwd);
+
+ pw = getpwuid(getuid());
+ if (!pw)
+ {
+ fprintf(stderr, "getpwuid() failed\n\n");
+ exit(EXIT_FAILURE);
+ }
+ pg_md5_encrypt(password, pw->pw_name, strlen(pw->pw_name), md5);
+ pool_create_passwdent(pw->pw_name, md5);
+ pool_finish_pool_passwd();
+}
static void
print_usage(const char prog[], int exit_code)
diff --git a/pool_passwd.c b/pool_passwd.c
new file mode 100644
index 000000000..3a493af96
--- /dev/null
+++ b/pool_passwd.c
@@ -0,0 +1,226 @@
+/* -*-pgsql-c-*- */
+/*
+ *
+ * $Header$
+ *
+ * pgpool: a language independent connection pool server for PostgreSQL
+ * written by Tatsuo Ishii
+ *
+ * Copyright (c) 2003-2010 PgPool Global Development Group
+ *
+ * Permission to use, copy, modify, and distribute this software and
+ * its documentation for any purpose and without fee is hereby
+ * granted, provided that the above copyright notice appear in all
+ * copies and that both that copyright notice and this permission
+ * notice appear in supporting documentation, and that the name of the
+ * author not be used in advertising or publicity pertaining to
+ * distribution of the software without specific, written prior
+ * permission. The author makes no representations about the
+ * suitability of this software for any purpose. It is provided "as
+ * is" without express or implied warranty.
+ *
+ * Module to handle pool_passwd
+ */
+
+#include <string.h>
+#include <errno.h>
+
+#include "pool.h"
+#include "pool_passwd.h"
+
+static FILE *passwd_fd = NULL; /* File descriptor for pool_passwd */
+
+/*
+ * Initialize this module.
+ * If pool_passwd does not exist yet, create it.
+ * Open pool_passwd.
+ */
+void pool_init_pool_passwd(char *pool_passwd_filename)
+{
+ if (passwd_fd)
+ return;
+
+ passwd_fd = fopen(pool_passwd_filename, "r+");
+ if (!passwd_fd)
+ {
+ if (errno == ENOENT)
+ {
+ /* The file does not exist yet. Create it. */
+ passwd_fd = fopen(pool_passwd_filename, "w+");
+ if (passwd_fd)
+ return;
+ }
+
+ pool_error("pool_init_pool_passwd: couldn't open %s. reason: %s",
+ pool_passwd_filename, strerror(errno));
+ }
+}
+
+/*
+ * Update passwd. If the user does not exist, create a new entry.
+ * Returns 0 on success non 0 oterwise.
+ */
+int pool_create_passwdent(char *username, char *passwd)
+{
+ int len;
+ int c;
+ char name[32];
+ char *p;
+ int readlen;
+
+ if (!passwd_fd)
+ {
+ pool_error("pool_create_passwdent: passwd_fd is NULL");
+ return -1;
+ }
+
+ len = strlen(passwd);
+ if (len != POOL_PASSWD_LEN)
+ {
+ pool_error("pool_create_passwdent: wrong password length:%d", len);
+ return -1;
+ }
+
+ rewind(passwd_fd);
+ name[0] = '\0';
+
+ while (!feof(passwd_fd))
+ {
+ p = name;
+ readlen = 0;
+
+ while (readlen < sizeof(name))
+ {
+ c = fgetc(passwd_fd);
+ if (c == EOF)
+ break;
+ else if (c == ':')
+ break;
+
+ readlen++;
+ *p++ = c;
+ }
+ *p = '\0';
+
+ if (!strcmp(username, name))
+ {
+ /* User name found. Update password. */
+ while ((c = *passwd++))
+ {
+ fputc(c, passwd_fd);
+ }
+ fputc('\n', passwd_fd);
+ return 0;
+ }
+ else
+ {
+ /* Skip password */
+ while((c = fgetc(passwd_fd)) != EOF &&
+ c != '\n')
+ ;
+ }
+ }
+
+ /*
+ * Not found the user name.
+ * Create a new entry.
+ */
+ while ((c = *username++))
+ {
+ fputc(c, passwd_fd);
+ }
+ fputc(':', passwd_fd);
+ while ((c = *passwd++))
+ {
+ fputc(c, passwd_fd);
+ }
+ fputc('\n', passwd_fd);
+
+ return 0;
+}
+
+/*
+ * Get password in pool_passwd by username. Returns NULL if specified
+ * entry does not exist or error occurred.
+ * Returned password is on the static memory.
+ */
+char *pool_get_passwd(char *username)
+{
+ int c;
+ char name[32];
+ static char passwd[POOL_PASSWD_LEN+1];
+ char *p;
+ int readlen;
+
+ if (!passwd_fd)
+ {
+ pool_error("pool_get_passwd: passwd_fd is NULL");
+ return NULL;
+ }
+
+ rewind(passwd_fd);
+ name[0] = '\0';
+
+ while (!feof(passwd_fd))
+ {
+ p = name;
+ readlen = 0;
+
+ while (readlen < sizeof(name))
+ {
+ c = fgetc(passwd_fd);
+ if (c == EOF)
+ break;
+ else if (c == ':')
+ break;
+
+ readlen++;
+ *p++ = c;
+ }
+ *p = '\0';
+
+ if (!strcmp(username, name))
+ {
+ /* User name found. Return password. */
+ p = passwd;
+ readlen = 0;
+
+ while((c = fgetc(passwd_fd)) != EOF &&
+ c != '\n' && readlen < (sizeof(passwd)-1))
+ {
+ *p++ = c;
+ readlen++;
+ }
+ *p = '\0';
+ return passwd;
+ }
+ else
+ {
+ /* Skip password */
+ while((c = fgetc(passwd_fd)) != EOF &&
+ c != '\n')
+ ;
+ }
+ }
+ return NULL;
+}
+
+/*
+ * Delete the entry by username. If specified entry does not exist,
+ * does nothing.
+ */
+void pool_delete_passwdent(char *username)
+{
+}
+
+/*
+ * Finish this moule. Close pool_passwd.
+ */
+void pool_finish_pool_passwd(void)
+{
+ if (passwd_fd)
+ {
+ fclose(passwd_fd);
+ passwd_fd = NULL;
+ }
+}
diff --git a/pool_passwd.h b/pool_passwd.h
new file mode 100644
index 000000000..854d7e6df
--- /dev/null
+++ b/pool_passwd.h
@@ -0,0 +1,40 @@
+/* -*-pgsql-c-*- */
+/*
+ *
+ * $Header$
+ *
+ * pgpool: a language independent connection pool server for PostgreSQL
+ * written by Tatsuo Ishii
+ *
+ * Copyright (c) 2003-2010 PgPool Global Development Group
+ *
+ * Permission to use, copy, modify, and distribute this software and
+ * its documentation for any purpose and without fee is hereby
+ * granted, provided that the above copyright notice appear in all
+ * copies and that both that copyright notice and this permission
+ * notice appear in supporting documentation, and that the name of the
+ * author not be used in advertising or publicity pertaining to
+ * distribution of the software without specific, written prior
+ * permission. The author makes no representations about the
+ * suitability of this software for any purpose. It is provided "as
+ * is" without express or implied warranty.
+ *
+ * pool_passwd.h: pool_passwd related definitions.
+ *
+ */
+
+#ifndef POOL_PASSWD_H
+#define POOL_PASSWD_H
+
+#include "pool.h"
+
+#define POOL_PASSWD_FILENAME "pool_passwd"
+#define POOL_PASSWD_LEN 35
+
+extern void pool_init_pool_passwd(char *pool_passwd_filename);
+extern int pool_create_passwdent(char *username, char *passwd);
+extern char *pool_get_passwd(char *username);
+extern void pool_delete_passwdent(char *username);
+extern void pool_finish_pool_passwd(void);
+
+#endif /* POOL_PASSWD_H */
[parent: da7d0645aae3]