[Issue #221] WIP

Author: gsmolk

Diff for: src/catalog.c

@@ -2012,6 +2012,13 @@ readBackupControlFile(const char *path)
 		return NULL;
 	}
 
+	if (parsed_options == -1)
+	{
+		elog(WARNING, "Failed to parse control file \"%s\"", path);
+		pgBackupFree(backup);
+		return NULL;
+	}
+
 	if (backup->start_time == 0)
 	{
 		elog(WARNING, "Invalid ID/start-time, control file \"%s\" is corrupted", path);

Diff for: src/configure.c

@@ -621,6 +621,13 @@ readInstanceConfigFile(const char *instance_name)
 		return NULL;
 	}
 
+	if (parsed_options == -1)
+	{
+		elog(WARNING, "Failed to parse control file \"%s\"", path);
+		pfree(instance);
+		return NULL;
+	}
+
 	if (log_level_console)
 		instance->logger.log_level_console = parse_log_level(log_level_console);
 

Diff for: src/pg_probackup.h

@@ -1044,4 +1044,7 @@ extern void get_header_errormsg(Page page, char **errormsg);
 extern void get_checksum_errormsg(Page page, char **errormsg,
 								  BlockNumber absolute_blkno);
 
+extern char *escape_single_quotes(const char *src);
+extern char *escapeConnectionParameter(const char *src);
+
 #endif /* PG_PROBACKUP_H */

Diff for: src/restore.c

@@ -1069,16 +1069,37 @@ create_recovery_conf(time_t backup_id,
 
 	if (params->restore_as_replica)
 	{
+		char *primary_conninfo = NULL;
+		char *escaped = NULL;
+		char *connstr = NULL;
 		fio_fprintf(fp, "\n## standby settings\n");
 	/* standby_mode was removed in PG12 */
 #if PG_VERSION_NUM < 120000
 		fio_fprintf(fp, "standby_mode = 'on'\n");
 #endif
 
 		if (params->primary_conninfo)
-			fio_fprintf(fp, "primary_conninfo = '%s'\n", params->primary_conninfo);
+		{
+//			fio_fprintf(fp, "primary_conninfo = '%s'\n", params->primary_conninfo);
+			primary_conninfo = escape_single_quotes(params->primary_conninfo);
+		}
 		else if (backup->primary_conninfo)
-			fio_fprintf(fp, "primary_conninfo = '%s'\n", backup->primary_conninfo);
+		{
+//			fio_fprintf(fp, "primary_conninfo = '%s'\n", backup->primary_conninfo);
+			primary_conninfo = escape_single_quotes(backup->primary_conninfo);
+		}
+
+		escaped = escapeConnectionParameter(primary_conninfo);
+		connstr = escape_single_quotes(escaped);
+
+//		pg_free(escaped);
+//		pg_free(connstr);
+
+		fio_fprintf(fp, "primary_conninfo = '%s'\n", connstr);
+		pg_free(primary_conninfo);
+		pg_free(escaped);
+		pg_free(connstr);
+
 
 		if (params->primary_slot_name != NULL)
 			fio_fprintf(fp, "primary_slot_name = '%s'\n", params->primary_slot_name);

Diff for: src/show.c

@@ -420,9 +420,17 @@ print_backup_json_object(PQExpBuffer buf, pgBackup *backup)
 	}
 
 	if (backup->primary_conninfo)
+	{
+//		char *escaped = escapeConnectionParameter(backup->primary_conninfo);
+//		char *connstr = escape_single_quotes(escaped);
+
 		json_add_value(buf, "primary_conninfo", backup->primary_conninfo,
 						json_level, true);
 
+//		pg_free(escaped);
+//		pg_free(connstr);
+	}
+
 	if (backup->external_dir_str)
 		json_add_value(buf, "external-dirs", backup->external_dir_str,
 						json_level, true);

Diff for: src/utils/configuration.c

@@ -302,6 +302,11 @@ skip_space(const char *str, const char *line)
 	return str;
 }
 
+/*
+ * TODO:
+ * user provides: -U "Mr. Mac'Nuggets"
+ * to recovery.conf in primary_conninfo must be saved: user=''Mr. Mac\\''Nuggets''
+ */
 static const char *
 get_next_token(const char *src, char *dst, const char *line)
 {
@@ -313,22 +318,27 @@ get_next_token(const char *src, char *dst, const char *line)
 		return NULL;
 
 	/* parse quoted string */
-	if (*s == '\'')
+	if (*s == '\'' || *s == '"')
 	{
 		s++;
 		for (i = 0, j = 0; s[i] != '\0'; i++)
 		{
-			if (s[i] == '\'')
+			/* If the current token is a single quote or a double quote and
+			 * the next token is string terminator, then there is no point in going futher
+			 */
+			if ((s[i] == '\'' || s[i] == '"') &&
+				s[i+1] == '\0')
 			{
 				i++;
-				/* doubled quote becomes just one quote */
-				if (s[i] == '\'')
-					dst[j] = s[i];
-				else
-					break;
+				break;
 			}
-			else
-				dst[j] = s[i];
+
+			/* doubled quote becomes just one quote */
+			if (s[i] == '\'' && s[i+1] == '\'')
+				i++;
+
+			/* simple token */
+			dst[j] = s[i];
 			j++;
 		}
 	}
@@ -342,7 +352,13 @@ get_next_token(const char *src, char *dst, const char *line)
 	return s + i;
 }
 
-static bool
+/* Return codes:
+ * 0 - PARSED pair
+ * 1 - SKIP
+ * 2 - ERROR
+ */
+
+static int
 parse_pair(const char buffer[], char key[], char value[])
 {
 	const char *start;
@@ -355,16 +371,20 @@ parse_pair(const char buffer[], char key[], char value[])
 	 */
 	start = buffer;
 	if ((start = skip_space(start, buffer)) == NULL)
-		return false;
+		return 1;
 
 	end = start + strcspn(start, "=# \n\r\t\v");
 
 	/* skip blank buffer */
 	if (end - start <= 0)
 	{
 		if (*start == '=')
-			elog(ERROR, "Syntax error in \"%s\"", buffer);
-		return false;
+		{
+			elog(WARNING, "Syntax error in \"%s\"", buffer);
+			return 2;
+		}
+
+		return 1;
 	}
 
 	/* key found */
@@ -373,12 +393,12 @@ parse_pair(const char buffer[], char key[], char value[])
 
 	/* find key and value split char */
 	if ((start = skip_space(end, buffer)) == NULL)
-		return false;
+		return 1;
 
 	if (*start != '=')
 	{
-		elog(ERROR, "Syntax error in \"%s\"", buffer);
-		return false;
+		elog(WARNING, "Syntax error in \"%s\"", buffer);
+		return 2;
 	}
 
 	start++;
@@ -387,18 +407,18 @@ parse_pair(const char buffer[], char key[], char value[])
 	 * parse value
 	 */
 	if ((end = get_next_token(start, value, buffer)) == NULL)
-		return false;
+		return 1;
 
 	if ((start = skip_space(end, buffer)) == NULL)
-		return false;
+		return 1;
 
 	if (*start != '\0' && *start != '#')
 	{
-		elog(ERROR, "Syntax error in \"%s\"", buffer);
-		return false;
+		elog(WARNING, "Syntax error in \"%s\"", buffer);
+		return 2;
 	}
 
-	return true;
+	return 0;
 }
 
 /*
@@ -484,6 +504,8 @@ config_get_opt(int argc, char **argv, ConfigOption cmd_options[],
 /*
  * Get configuration from configuration file.
  * Return number of parsed options.
+ *
+ * -1 means that error was encountered
  */
 int
 config_read_opt(const char *path, ConfigOption options[], int elevel,
@@ -503,12 +525,15 @@ config_read_opt(const char *path, ConfigOption options[], int elevel,
 
 	while (fgets(buf, lengthof(buf), fp))
 	{
+		int         rc;
 		size_t		i;
 
 		for (i = strlen(buf); i > 0 && IsSpace(buf[i - 1]); i--)
 			buf[i - 1] = '\0';
 
-		if (parse_pair(buf, key, value))
+		rc = parse_pair(buf, key, value);
+
+		if (rc == 0)
 		{
 			for (i = 0; options[i].type; i++)
 			{
@@ -531,6 +556,11 @@ config_read_opt(const char *path, ConfigOption options[], int elevel,
 			if (strict && !options[i].type)
 				elog(elevel, "Invalid option \"%s\" in file \"%s\"", key, path);
 		}
+		else if (rc == 2)
+		{
+			elog(elevel, "Failed to parse string \"%s\" in file \"%s\"", buf, path);
+			return -1;
+		}
 	}
 
 	if (ferror(fp))

Diff for: src/utils/pgut.c

@@ -101,7 +101,7 @@ prompt_for_password(const char *username)
  *
  * The returned string is malloc'd. Return NULL on out-of-memory.
  */
-static char *
+char *
 escapeConnectionParameter(const char *src)
 {
 	bool		need_quotes = false;
@@ -156,6 +156,47 @@ escapeConnectionParameter(const char *src)
 	return dstbuf;
 }
 
+/*
+ * Escape (by doubling) any single quotes or backslashes in given string
+ *
+ * Note: this is used to process postgresql.conf entries and to quote
+ * string literals in pg_basebackup for creating recovery.conf.
+ * Since postgresql.conf strings are defined to treat backslashes as escapes,
+ * we have to double backslashes here.
+ *
+ * Since this function is only used for parsing or creating configuration
+ * files, we do not care about encoding considerations.
+ *
+ * Returns a malloced() string that it's the responsibility of the caller
+ * to free.
+ */
+char *
+escape_single_quotes(const char *src)
+{
+	int			len = strlen(src),
+				i,
+				j;
+	char	   *result = malloc(len * 2 + 1);
+
+	if (!result)
+		return NULL;
+
+	for (i = 0, j = 0; i < len; i++)
+	{
+//		if (SQL_STR_DOUBLE(src[i], true))
+//			result[j++] = src[i];
+		if (src[i] == '\'')
+			result[j++] = src[i];
+		else if (src[i] == '\\')
+			result[j++] = src[i];
+
+		result[j++] = src[i];
+//		result[j++] = src[i];
+	}
+	result[j] = '\0';
+	return result;
+}
+
 /* Construct a connection string for possible future use in recovery.conf */
 char *
 pgut_get_conninfo_string(PGconn *conn)
@@ -165,7 +206,7 @@ pgut_get_conninfo_string(PGconn *conn)
 	PQExpBuffer buf = createPQExpBuffer();
 	char	   *connstr;
 	bool		firstkeyword = true;
-	char	   *escaped;
+	char	   *escaped = NULL;
 
 	connOptions = PQconninfo(conn);
 	if (connOptions == NULL)
@@ -198,12 +239,18 @@ pgut_get_conninfo_string(PGconn *conn)
 
 		firstkeyword = false;
 
-		escaped = escapeConnectionParameter(option->val);
-		appendPQExpBuffer(buf, "%s=%s", option->keyword, escaped);
-		free(escaped);
+//		escaped = escapeConnectionParameter(option->val);
+		appendPQExpBuffer(buf, "%s=%s", option->keyword, option->val);
+		pg_free(escaped);
 	}
 
-	connstr = pg_strdup(buf->data);
+//	elog(INFO, "CONNSTR: %s", buf->data);
+//	connstr = escape_single_quotes(buf->data);
+
+	connstr = pgut_strdup(buf->data);
+
+	elog(INFO, "CONNSTR2: %s", connstr);
+
 	destroyPQExpBuffer(buf);
 	return connstr;
 }