Fix issues with scram authorization

knizhnik · knizhnik · commit b6d7ef672aad · 2017-01-18T19:36:35.000+03:00
diff --git a/contrib/mmts/multimaster.c b/contrib/mmts/multimaster.c
@@ -1111,38 +1111,31 @@ MtmPostPrepareTransaction(MtmCurrentTrans* x)
 	MtmLock(LW_EXCLUSIVE);
 	ts = (MtmTransState*)hash_search(MtmXid2State, &x->xid, HASH_FIND, NULL);
 	Assert(ts != NULL);
-	//if (x->gid[0]) MTM_LOG1("Preparing transaction %d (%s) at %ld", x->xid, x->gid, MtmGetCurrentTime());
 	if (!MtmIsCoordinator(ts) || Mtm->status == MTM_RECOVERY) {
-		MTM_TXTRACE(x, "recovery?");
 		MTM_LOG3("Preparing transaction %d (%s) at %ld", x->xid, x->gid, MtmGetCurrentTime());
 		Assert(x->gid[0]);
 		ts->votingCompleted = true;
-		MTM_TXTRACE(x, "recovery? 1");
 		if (Mtm->status != MTM_RECOVERY/* || Mtm->recoverySlot != MtmReplicationNodeId*/) {
-			MTM_TXTRACE(x, "recovery? 2"); 
 			MtmSend2PCMessage(ts, MSG_PREPARED); /* send notification to coordinator */
 			if (!MtmUseDtm) { 
 				ts->status = TRANSACTION_STATUS_UNKNOWN;
 			}
 		} else {
-			MTM_TXTRACE(x, "recovery? 3");
 			ts->status = TRANSACTION_STATUS_UNKNOWN;
 		}
-		MTM_TXTRACE(x, "recovery? 4");
 		MtmUnlock();
-		MTM_TXTRACE(x, "recovery? 5");
 		MtmResetTransaction();
-		MTM_TXTRACE(x, "recovery? 6");
-	} else if (!ts->isLocal)  { 
-		MTM_TXTRACE(x, "not recovery?");
-		Mtm2PCVoting(x, ts);
+	} else { 
+		if (!ts->isLocal)  { 
+			Mtm2PCVoting(x, ts);
+		} else { 
+			ts->votingCompleted = true;
+		}
 		MtmUnlock();
 		if (x->isTwoPhase) { 
 			MtmResetTransaction();
 		}
 	}
-	MTM_TXTRACE(x, "recovery? 7");
-	//if (x->gid[0]) MTM_LOG1("Prepared transaction %d (%s) csn=%ld at %ld: %d", x->xid, x->gid, ts->csn, MtmGetCurrentTime(), ts->status);
 	if (Mtm->inject2PCError == 3) { 
 		Mtm->inject2PCError = 0;
 		elog(ERROR, "ERROR INJECTION for transaction %s (%lu)", x->gid, (long)x->xid);
@@ -1182,6 +1175,8 @@ MtmPreCommitPreparedTransaction(MtmCurrentTrans* x)
 			MtmLock(LW_EXCLUSIVE);
 
 			Mtm2PCVoting(x, ts);
+		} else { 
+			ts->status = TRANSACTION_STATUS_UNKNOWN;
 		}
 
 		x->xid = ts->xid;
diff --git a/contrib/mmts/tests2/support/docker-regress.sh b/contrib/mmts/tests2/support/docker-regress.sh
@@ -11,7 +11,7 @@ psql -U postgres regression <<-SQL
 SQL
 
 ./pg_regress --use-existing \
-    --schedule=parallel_schedule \
+    --schedule=serial_schedule \
     --host=node1 \
     --user=postgres
 
diff --git a/src/backend/libpq/auth-scram.c b/src/backend/libpq/auth-scram.c
@@ -968,5 +968,26 @@ generate_nonce(char *result, int len)
 {
 	/* Use the salt generated for SASL authentication */
 	memset(result, 0, len);
-	memcpy(result, MyProcPort->SASLSalt, Min(sizeof(MyProcPort->SASLSalt), len));
+	if (MyProcPort == NULL) { 
+		int count;
+		/* compute the salt to use for computing responses */
+		while (count < sizeof(MyProcPort->SASLSalt) && count < len)
+		{
+			char	byte;			
+			if (!pg_strong_random(&byte, 1))
+			{
+				elog(ERROR, "Could not generate random salt");
+			}			
+			/*
+			 * Only ASCII printable characters, except commas are accepted in
+			 * the nonce.
+			 */
+			if (byte < '!' || byte > '~' || byte == ',')
+				continue;
+			
+			result[count++] = byte;
+		}
+	} else { 		
+		memcpy(result, MyProcPort->SASLSalt, Min(sizeof(MyProcPort->SASLSalt), len));
+	}
 }
