prestogres 0.1.0 → 0.2.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: fdbbafba90e2dde6d7340746b30d369eda073ed9
+  data.tar.gz: 57d91cbb2bb74c2ce53132ea9309eb9a0cb47e09
+SHA512:
+  metadata.gz: f166e0435a473ec6930522f0a139733f24227a8b0045725fc1e89f4afda25c6fd589c2dc121a46e99c82f79bba135c601b42fec45651c66c185a0aaae6f52eb6
+  data.tar.gz: c351d1a8fe7c59cc7b9a2ec603935766141958df839d4f7179a9921e9410b2da513f6b05beab2f6b5d3d96be309542df876b01fce42f4021f0692d40ceb84652

data/ChangeLog

@@ -0,0 +1,16 @@
+
+2014-01-24 version 0.2.0:
+
+* Authentication mechanisms support pg_database and pg_user options to
+  overwrite connecting PostgreSQL database and role name
+* Forward error message from PostgreSQL to clients instead of killing the
+  session so that clients can know the reason
+* Reject 'P' (Parse) command to reject extended query protocol immediately
+* Enabled timeout in Presto HTTP client
+* Queries to system catalogs delete created tables by rollbacking
+subtransaction so that other sessions does not conflict
+
+2014-01-15 version 0.1.0:
+
+* First release
+

data/README.md

@@ -12,7 +12,7 @@ With Prestogres, you can use PostgreSQL clients to run queries on Presto:
 * [PostgreSQL JDBC driver](http://jdbc.postgresql.org/)
 * other PostgreSQL client libraries
 
-Prestogres also offers password-based authorization (Presto doesn't have authorization by default).
+Prestogres also offers password-based authentication and SSL.
 
 ## How it works?
 
@@ -130,6 +130,8 @@ host     altdb      pg     0.0.0.0/0                     prestogres_md5        s
 host     all        all    0.0.0.0/0                     prestogres_external   auth_prog:/opt/prestogres/auth.py
 ```
 
+See also *Creating database* section.
+
 #### prestogres_md5 method
 
 This authentication method uses a password file **\<data_dir\>/pgpool2/pool_passwd** to authenticate an user. You can use `prestogres passwd` command to add an user to this file:
@@ -145,6 +147,8 @@ In pool_hba.conf file, you can set following options to OPTIONS field:
 * **catalog**: Catalog (connector) name of Presto, which overwrites `presto_catalog` parameter in pgpool.conf.
 * **schema**: Schema name of Presto, which overwrites `presto_schema` parameter in pgpool.conf.
 * **user**: User name to run queries on Presto. By default, Prestogres uses the same user name used to login to pgpool-II.
+* **pg_database**: Overwrite database to connect to PostgreSQL.
+* **pg_user**: Overwrite user name to connect to PostgreSQL.
 
 
 #### prestogres_external method
@@ -164,18 +168,41 @@ address:IPADDR
 
 ```
 
-If you want to allow this connection, the program optionally prints following lines to STDOUT, and exists with status code 0:
+If you want to allow this connection, the program optionally prints parameters as following to STDOUT, and exists with status code 0:
 
 ```
 server:PRESTO_SERVER_ADDRESS
 catalog:PRESTO_CATALOG_NAME
 schema:PRESTO_SCHEMA_NAME
+user:USER_NAME
+pg_database:DATABASE
+pg_user:USER_NAME
 
 ```
 
+See *pgool.conf file* section for available parameters.
+
 If you want to reject this connection, the program exists with non-0 status code.
 
 
+### Creating database on PostgreSQL
+
+Prestogres setups a database named *postgres* on PostgreSQL by default. But you may want to create other databases
+to take advantage of above authentication mechanism.
+
+To create new databases:
+
+1. Create a new PostgreSQL database using `createdb` command. Port number is **6432** because you login to PostgreSQL directly:
+```
+$ createdb -h localhost -p 6432 -U pg newdb
+```
+
+2. Initialize the database using statements shown by `prestogres show_init_sql` command:
+```
+$ prestogres show_init_sql | psql -h localhost -p 6432 -U pg newdb
+```
+
+
 ### prestogres command
 
 Usage of `prestogres` command:
@@ -191,6 +218,7 @@ commands:
   pg_ctl stop           stop  postgres server daemon process
   postgres              start postgres server as a foreground process
   passwd <USER NAME>    add new md5 password entry for an user
+  show_init_sql         display statements to initialize a new PostgreSQL database
 ```
 
 ## Development

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.2.0

data/bin/prestogres

@@ -17,6 +17,7 @@ def usage(error=nil)
   puts "  pg_ctl stop           stop  postgres server daemon process"
   puts "  postgres              start postgres server as a foreground process"
   puts "  passwd <USER NAME>    add new md5 password entry for an user"
+  puts "  show_init_sql         display statements to initialize a new PostgreSQL database"
   puts ""
   puts "error: #{error}" if error
   exit 0
@@ -53,6 +54,9 @@ ARGV.each_with_index do |a,i|
   when "passwd"
     config[:command] = :passwd
     break
+  when "show_init_sql"
+    config[:command] = :show_init_sql
+    break
   end
 end
 
@@ -97,13 +101,14 @@ when :setup
       puts "** setup failed **"
       puts "******************"
       puts ""
-      puts "-D directory is inconsistent."
-      puts "If you're running command on Mac OS X, you might need to run following commands:"
+      puts "  * -D directory is inconsistent."
+      puts ""
+      puts "  * If you're running command on Mac OS X, you might need to run following commands:"
       puts ""
-      puts "  $ sudo sysctl -w kern.sysv.shmmax=1073741824"
-      puts "  $ sudo sysctl -w kern.sysv.shmall=1073741824"
+      puts "    $ sudo sysctl -w kern.sysv.shmmax=1073741824"
+      puts "    $ sudo sysctl -w kern.sysv.shmall=1073741824"
       puts ""
-      puts "Please delete the directory (rm -rf) first before retrying."
+      puts "  * Please delete the directory (rm -rf) first before retrying."
       puts ""
       exit 1
     end
@@ -143,8 +148,7 @@ when :setup
   begin
     sleep 1
 
-    run_setup_command "psql -h 127.0.0.1 -p #{setup_params[:backend_port]} -U pg postgres < #{File.join(pgsql_dir, "setup_language.sql")}"
-    run_setup_command "psql -h 127.0.0.1 -p #{setup_params[:backend_port]} -U pg postgres < #{File.join(pgsql_dir, "setup_functions.sql")}"
+    run_setup_command "psql -h 127.0.0.1 -p #{setup_params[:backend_port]} -U pg postgres < #{File.join(pgsql_dir, "setup.sql")}"
   ensure
     run_setup_command %w[pg_ctl -D] + [File.join(data_dir, 'postgres')] + %w[stop]
   end
@@ -210,6 +214,10 @@ when :passwd
     exit $?.exitstatus
   end
 
+when :show_init_sql
+  pgsql_dir = File.join(File.dirname(__FILE__), "..", "pgsql")
+  STDOUT.write File.read(File.join(pgsql_dir, "setup.sql"))
+
 else
   unless config[:data_dir]
     usage "-D option is required"

data/pgpool2/child.c

@@ -95,6 +95,46 @@ volatile sig_atomic_t got_sighup = 0;
 char remote_host[NI_MAXHOST];	/* client host */
 char remote_port[NI_MAXSERV];	/* client port */
 
+static void rebuild_startup_packet(StartupPacket *sp)
+{
+	if (sp->major == PROTO_MAJOR_V2) {
+		StartupPacket_v2 *sp2 = (StartupPacket_v2 *)(sp->startup_packet);
+		strncpy(sp2->database, sp2->database, SM_DATABASE);
+		strncpy(sp2->user, sp->user, SM_USER);
+
+	} else if (sp->major == PROTO_MAJOR_V3) {
+		int append_size;
+		char *data, *p;
+
+		append_size = strlen("database") + strlen("user") + strlen(sp->database) + strlen(sp->user) + 4;
+
+		data = malloc(sp->len + append_size);
+		if (data == NULL) {
+			pool_error("rebuild_startup_packet: out of memory");
+			exit(1);
+		}
+		memcpy(data, sp->startup_packet, sp->len);
+		p = data + sp->len - 1;  /* remove last terminator byte */
+
+		strcpy(p, "database");
+		p += (strlen("database") + 1);
+		strcpy(p, sp->database);
+		p += (strlen(sp->database) + 1);
+
+		strcpy(p, "user");
+		p += (strlen("user") + 1);
+		strcpy(p, sp->user);
+		p += (strlen(sp->user) + 1);
+
+		*p = '\0';  /* add terminator byte */
+
+		free(sp->startup_packet);
+		sp->startup_packet = data;
+
+		sp->len = sp->len + append_size;
+	}
+}
+
 /*
 * child main loop
 */
@@ -276,6 +316,20 @@ void do_child(int unix_fd, int inet_fd)
 				child_exit(1);
 			}
 			ClientAuthentication(frontend);
+
+			/* ClientAuthentication can overwrite database and user */
+			if (strcmp(sp->database, frontend->database) || strcmp(sp->user, frontend->username)) {
+				free(sp->database);
+				sp->database = strdup(frontend->database);
+				free(sp->user);
+				sp->user = strdup(frontend->username);
+				if (frontend->username == NULL)
+				{
+					pool_error("do_child: strdup failed: %s\n", strerror(errno));
+					child_exit(1);
+				}
+				rebuild_startup_packet(sp);
+			}
 		}
 
 		/* this should run after ClientAuthentication */

data/pgpool2/pool.h

@@ -605,9 +605,11 @@ extern void reset_connection(void);
 extern void per_node_statement_log(POOL_CONNECTION_POOL *backend, int node_id, char *query);
 extern void per_node_error_log(POOL_CONNECTION_POOL *backend, int node_id, char *query, char *prefix, bool unread);
 extern int pool_extract_error_message(bool read_kind, POOL_CONNECTION *backend, int major, bool unread, char **message);
+extern int pool_extract_error_message_with_errcode(bool read_kind, POOL_CONNECTION *backend, int major, bool unread, char **message, char **errcode);
 extern POOL_STATUS do_command(POOL_CONNECTION *frontend, POOL_CONNECTION *backend,
 					   char *query, int protoMajor, int pid, int key, int no_ready_for_query);
 extern POOL_STATUS do_query(POOL_CONNECTION *backend, char *query, POOL_SELECT_RESULT **result, int major);
+extern POOL_STATUS do_query_or_get_error_message(POOL_CONNECTION *backend, char *query, POOL_SELECT_RESULT **result, int major, char **error_message, char **errcode);
 extern void free_select_result(POOL_SELECT_RESULT *result);
 extern int compare(const void *p1, const void *p2);
 extern POOL_STATUS do_error_execute_command(POOL_CONNECTION_POOL *backend, int node_id, int major);

data/pgpool2/pool_hba.c

@@ -75,8 +75,8 @@ const char* presto_catalog = NULL;
 const char* presto_schema = NULL;
 const char* presto_external_auth_prog = NULL;
 
-static bool prestogres_hba_set_session_info(const char* key, const char* value);
-static void prestogres_hba_parse_arg(const char* arg);
+static bool prestogres_hba_set_session_info(POOL_CONNECTION *frontend, const char* key, const char* value);
+static void prestogres_hba_parse_arg(POOL_CONNECTION *frontend, const char* arg);
 static POOL_STATUS pool_prestogres_hba_auth_md5(POOL_CONNECTION *frontend);
 static POOL_STATUS pool_prestogres_hba_auth_external(POOL_CONNECTION *frontend);
 
@@ -1497,9 +1497,9 @@ static POOL_STATUS CheckMd5Auth(char *username)
 	return POOL_CONTINUE;
 }
 
-static bool prestogres_hba_set_session_info(const char* key, const char* value)
+static bool prestogres_hba_set_session_info(POOL_CONNECTION *frontend, const char* key, const char* value)
 {
-	pool_debug("presto_external_auth_prog: key:%s value:%s", key, value);
+	pool_debug("presto_external_auth_prog: key '%s' value '%s'", key, value);
 
 	if (strcmp(key, "server") == 0) {
 		presto_server = value;
@@ -1513,6 +1513,14 @@ static bool prestogres_hba_set_session_info(const char* key, const char* value)
 	} else if (strcmp(key, "schema") == 0) {
 		presto_schema = value;
 		return true;
+	} else if (strcmp(key, "pg_user") == 0) {
+		free(frontend->username);
+		frontend->username = strdup(value);
+		return true;
+	} else if (strcmp(key, "pg_database") == 0) {
+		free(frontend->database);
+		frontend->database = strdup(value);
+		return true;
 	} else if (strcmp(key, "auth_prog") == 0) {
 		presto_external_auth_prog = value;
 		return true;
@@ -1522,7 +1530,7 @@ static bool prestogres_hba_set_session_info(const char* key, const char* value)
 	return false;
 }
 
-static void prestogres_hba_parse_arg(const char* arg)
+static void prestogres_hba_parse_arg(POOL_CONNECTION *frontend, const char* arg)
 {
 	char *str, *tok;
 
@@ -1539,7 +1547,7 @@ static void prestogres_hba_parse_arg(const char* arg)
 			break;
 		}
 		*p = '\0';
-		prestogres_hba_set_session_info(tok, p + 1);
+		prestogres_hba_set_session_info(frontend, tok, p + 1);
 	}
 }
 
@@ -1551,7 +1559,7 @@ static POOL_STATUS pool_prestogres_hba_auth_md5(POOL_CONNECTION *frontend)
 	static char encbuf[POOL_PASSWD_LEN+1];
 	char salt[4];
 
-	prestogres_hba_parse_arg(frontend->auth_arg);
+	prestogres_hba_parse_arg(frontend, frontend->auth_arg);
 
 	pool_passwd = pool_get_passwd(frontend->username);
 	pool_random_salt(salt);
@@ -1659,7 +1667,7 @@ static bool do_external_auth(POOL_CONNECTION* frontend, const char* password)
 		pos += strlen(line);
 	}
 
-	prestogres_hba_parse_arg(buffer);
+	prestogres_hba_parse_arg(frontend, buffer);
 
 	if (waitpid(pid, &status, 0) < 0) {
 		pool_error("waitpid() failed. reason: %s", strerror(errno));
@@ -1673,12 +1681,12 @@ static POOL_STATUS pool_prestogres_hba_auth_external(POOL_CONNECTION *frontend)
 {
 	char *passwd;
 
-	prestogres_hba_parse_arg(frontend->auth_arg);
+	prestogres_hba_parse_arg(frontend, frontend->auth_arg);
 
 	if (presto_external_auth_prog == NULL) {
 		presto_external_auth_prog = pool_config->presto_external_auth_prog;
 		if (presto_external_auth_prog == NULL) {
-			pool_error("pool_prestogres_hba_auth_external: 'prog:' argument is not set to pool_hba entry for user '%s'", frontend->username);
+			pool_error("pool_prestogres_hba_auth_external: 'auth_prog:' argument is not set to pool_hba entry for user '%s'", frontend->username);
 			exit(1);
 		}
 	}

data/pgpool2/pool_process_query.c

@@ -2367,6 +2367,11 @@ void free_select_result(POOL_SELECT_RESULT *result)
  * insert_lock(), and the qury is either LOCK or SELECT for UPDATE.
  */
 POOL_STATUS do_query(POOL_CONNECTION *backend, char *query, POOL_SELECT_RESULT **result, int major)
+{
+	return do_query_or_get_error_message(backend, query, result, major, NULL, NULL);
+}
+
+POOL_STATUS do_query_or_get_error_message(POOL_CONNECTION *backend, char *query, POOL_SELECT_RESULT **result, int major, char **error_message, char **errcode)
 {
 #define DO_QUERY_ALLOC_NUM 1024	/* memory allocation unit for POOL_SELECT_RESULT */
 
@@ -2586,23 +2591,27 @@ POOL_STATUS do_query(POOL_CONNECTION *backend, char *query, POOL_SELECT_RESULT *
 		{
 			char *message;
 
-			if (pool_extract_error_message(false, backend, major, true, &message))
+			if (pool_extract_error_message_with_errcode(false, backend, major, true, &message, errcode))
 			{
-				pool_error("do_query: error message from backend: %s. Exit this session.", message);
-				/*
-				 * This is fatal. Because: If we operate extended
-				 * query, backend would not accept subsequent commands
-				 * until "sync" message issued. However, if sync
-				 * message issued, unnamed statement/unnamed portal
-				 * will disappear and will cause lots of problems.  If
-				 * we do not operate extended query, ongoing
-				 * transaction is aborted, and subsequent query would
-				 * not accepted.  In summary there's no transparent
-				 * way for frontend to handle error case. The only way
-				 * is closing this session.
-				 */
-				child_exit(1);
-				return POOL_END;
+				if (error_message != NULL) {
+					*error_message = message;
+				} else {
+					pool_error("do_query: error message from backend: %s. Exit this session.", message);
+					/*
+					 * This is fatal. Because: If we operate extended
+					 * query, backend would not accept subsequent commands
+					 * until "sync" message issued. However, if sync
+					 * message issued, unnamed statement/unnamed portal
+					 * will disappear and will cause lots of problems.  If
+					 * we do not operate extended query, ongoing
+					 * transaction is aborted, and subsequent query would
+					 * not accepted.  In summary there's no transparent
+					 * way for frontend to handle error case. The only way
+					 * is closing this session.
+					 */
+					child_exit(1);
+					return POOL_END;
+				}
 			}
 		}
 
@@ -4585,6 +4594,11 @@ static int detect_error(POOL_CONNECTION *backend, char *error_code, int major, c
  * extract error message -1: error)
  */
 int pool_extract_error_message(bool read_kind, POOL_CONNECTION *backend, int major, bool unread, char **message)
+{
+	return pool_extract_error_message_with_errcode(read_kind, backend, major, unread, message, NULL);
+}
+
+int pool_extract_error_message_with_errcode(bool read_kind, POOL_CONNECTION *backend, int major, bool unread, char **message, char **errcode)
 {
 	char kind;
 	int readlen = 0, len;
@@ -4617,6 +4631,7 @@ int pool_extract_error_message(bool read_kind, POOL_CONNECTION *backend, int maj
 	if (major == PROTO_MAJOR_V3)
 	{
 		char *e;
+		char *bufpos, *bufpos_end;
 
 		if (pool_read(backend, &len, sizeof(len)) < 0)
 			return -1;
@@ -4649,15 +4664,27 @@ int pool_extract_error_message(bool read_kind, POOL_CONNECTION *backend, int maj
 		 * (xxxxxx is error message).
 		 */
 		e = str;
+		*message = message_buf;
+		bufpos = message_buf;
+		bufpos_end = message_buf + sizeof(message_buf);
+		bufpos[0] = '\0';
 		while (*e)
 		{
 			if (*e == 'M')
 			{
 				e++;
-				strncpy(message_buf, e, sizeof(message_buf)-1);
-				message_buf[sizeof(message_buf)-1] = '\0';
+				strlcpy(bufpos, e, bufpos_end - bufpos - 1);
+				*message = bufpos;
+				bufpos += strlen(bufpos) + 1;
 				break;
 			}
+			else if (errcode != NULL && *e == 'C')
+			{
+				e++;
+				strlcpy(bufpos, e, bufpos_end - bufpos - 1);
+				*errcode = bufpos;
+				bufpos += strlen(bufpos) + 1;
+			}
 			else
 				e = e + strlen(e) + 1;
 		}
@@ -4678,6 +4705,7 @@ int pool_extract_error_message(bool read_kind, POOL_CONNECTION *backend, int maj
 		memcpy(p, str, len);
 		memcpy(message_buf, str, len);
 		message_buf[len] = '\0';
+		*message = message_buf;
 	}
 
 	if (unread)
@@ -4687,7 +4715,6 @@ int pool_extract_error_message(bool read_kind, POOL_CONNECTION *backend, int maj
 			return -1;
 	}
 
-	*message = message_buf;
 	return 1;
 }