common, webui: Updates to support visualisation of live databases

Author: justinclift

api/handlers.go

@@ -1232,7 +1232,7 @@ func tablesHandler(w http.ResponseWriter, r *http.Request) {
 			return
 		}
 	} else {
-		// Send the columns request to our AMQP backend
+		// Send the tables request to our AMQP backend
 		var rawResponse []byte
 		rawResponse, err = com.MQRequest(com.AmqpChan, liveNode, "tables", loggedInUser, dbOwner, dbName, "")
 		if err != nil {

common/postgresql.go

@@ -214,20 +214,16 @@ func CheckDBPermissions(loggedInUser, dbOwner, dbFolder, dbName string, writeAcc
 		return false, err
 	}
 
-	// If we get here this means that the database does exist. The next step is to check
-	// the permissions.
+	// If we get here this means that the database does exist. The next step is to check the permissions.
 
 	if strings.ToLower(loggedInUser) == strings.ToLower(dbOwner) {
 		// If the request is from the owner of the database, always allow access to the database
-
 		return true, nil
 	} else if writeAccess == false && dbPublic {
 		// Read access to public databases is always permitted
-
 		return true, nil
 	} else if loggedInUser == "" {
 		// If the user is not logged in and we reach this point, access is not permitted
-
 		return false, nil
 	}
 

common/sqlite.go

@@ -1405,9 +1405,7 @@ func SQLiteRunQueryDefensive(w http.ResponseWriter, r *http.Request, querySource
 	}
 
 	// Automatically close the SQLite database when this function finishes
-	defer func() {
-		sdb.Close()
-	}()
+	defer sdb.Close()
 
 	// Was a user agent part of the request?
 	var userAgent string

common/userinput.go

@@ -28,12 +28,16 @@ func CheckUnicode(rawInput string) (str string, err error) {
 	var decoded []byte
 	decoded, err = base64.StdEncoding.DecodeString(rawInput)
 	if err != nil {
-		// When base64 decoding fails, automatically try again with base64url format instead
-		var err2 error
+		// When base64 decoding fails, automatically try again with base64url formats instead
+		var err2 error // We use err2, to not overwrite the initial error message
 		decoded, err2 = base64.URLEncoding.DecodeString(rawInput)
 		if err2 != nil {
-			// We use err2, so the original error message is returned if the 2nd attempt fails
-			return
+			// Try base64URL with no padding character(s) this time
+			decoded, err2 = base64.RawURLEncoding.DecodeString(rawInput)
+			if err2 != nil {
+				// Nope.  Seems like a genuine decoding problem
+				return
+			}
 		}
 	}