Merge branch 'REL1_6_STABLE'

Author: jcflack

.github/workflows/ci-runnerpg.yml

@@ -6,6 +6,10 @@ arch:
   - ppc64le
 dist: bionic
 env:
+  - POSTGRESQL_VERSION: 13
+    JAVA_VERSION: 15
+    JVM_IMPL: hotspot
+    MVN_VERSION: 3.5.2
   - POSTGRESQL_VERSION: 12
     JAVA_VERSION: 14
     JVM_IMPL: hotspot
@@ -151,8 +155,13 @@ script: |
 
   boolean succeeding = false; // begin pessimistic
 
+  import static java.nio.file.Files.createTempFile
+  import static java.nio.file.Files.write
+  import java.nio.file.Path
   import static java.nio.file.Paths.get
   import java.sql.Connection
+  import java.sql.PreparedStatement
+  import java.sql.ResultSet
   import org.postgresql.pljava.packaging.Node
   import static org.postgresql.pljava.packaging.Node.q
   import static org.postgresql.pljava.packaging.Node.stateMachine
@@ -200,7 +209,7 @@ script: |
         "create extension no result",
         null,
 
-        q(c, "create extension pljava")
+        q(c, "CREATE EXTENSION pljava")
         .flatMap(Node::semiFlattenDiagnostics)
         .peek(Node::peek),
 
@@ -251,6 +260,70 @@ script: |
         (o,p,q) -> null == o
       );
 
+      /*
+       * Exercise TrialPolicy some. Need another connection to change
+       * vmoptions. Uses some example functions, so insert here before the
+       * test of undeploying the examples.
+       */
+      try ( Connection c2 = n1.connect() )
+      {
+        Path trialPolicy =
+          createTempFile(n1.data_dir().getParent(), "trial", "policy");
+
+        write(trialPolicy, List.of(
+          "grant {",
+          "  permission",
+          "    org.postgresql.pljava.policy.TrialPolicy$Permission;",
+          "};"
+        ));
+
+        PreparedStatement setVmOpts = c2.prepareStatement(
+          "SELECT null::pg_catalog.void" +
+          " FROM pg_catalog.set_config('pljava.vmoptions', ?, false)"
+        );
+
+        setVmOpts.setString(1, vmopts +
+          " -Dorg.postgresql.pljava.policy.trial=" + trialPolicy.toUri());
+
+        succeeding &= stateMachine(
+          "change pljava.vmoptions",
+          null,
+
+          q(setVmOpts, setVmOpts::execute)
+          .flatMap(Node::semiFlattenDiagnostics)
+          .peek(Node::peek),
+
+          (o,p,q) -> isDiagnostic(o, Set.of("error")) ? 1 : -2,
+          (o,p,q) -> isVoidResultSet(o, 1, 1) ? 3 : false,
+          (o,p,q) -> null == o
+        );
+
+        PreparedStatement tryForbiddenRead = c2.prepareStatement(
+          "SELECT" +
+          "  CASE WHEN javatest.java_getsystemproperty('java.home')" +
+          "    OPERATOR(pg_catalog.=) ?" +
+          "  THEN javatest.logmessage('INFO', 'trial policy test ok')" +
+          "  ELSE javatest.logmessage('WARNING', 'trial policy test ng')" +
+          "  END"
+        );
+
+        tryForbiddenRead.setString(1, System.getProperty("java.home"));
+
+        succeeding &= stateMachine(
+          "try to read a forbidden property",
+          null,
+
+          q(tryForbiddenRead, tryForbiddenRead::execute)
+          .flatMap(Node::semiFlattenDiagnostics)
+          .peek(Node::peek),
+
+          (o,p,q) -> isDiagnostic(o, Set.of("error", "warning")) ? 1 : -2,
+          (o,p,q) -> isVoidResultSet(o, 1, 1) ? 3 : false,
+          (o,p,q) -> null == o
+        );
+        // done with connection c2
+      }
+
       /*
        * Also confirm that the generated undeploy actions work.
        */
@@ -266,6 +339,148 @@ script: |
         (o,p,q) -> isVoidResultSet(o, 1, 1) ? 3 : false,
         (o,p,q) -> null == o
       );
+
+      /*
+       * Get another new connection and make sure the extension can be
+       * loaded in a non-superuser session.
+       */
+      try ( Connection c2 = n1.connect() )
+      {
+        succeeding &= stateMachine(
+          "become non-superuser",
+          null,
+
+          q(c2,
+            "CREATE ROLE alice;" +
+            "GRANT USAGE ON SCHEMA sqlj TO alice;" +
+            "SET SESSION AUTHORIZATION alice")
+          .flatMap(Node::semiFlattenDiagnostics)
+          .peek(Node::peek),
+
+          (o,p,q) -> isDiagnostic(o, Set.of("error")) ? 1 : -2,
+          (o,p,q) -> null == o
+        );
+
+        succeeding &= stateMachine(
+          "load as non-superuser",
+          null,
+
+          q(c2, "SELECT null::pg_catalog.void" +
+                " FROM sqlj.get_classpath('public')")
+          .flatMap(Node::semiFlattenDiagnostics)
+          .peek(Node::peek),
+
+          (o,p,q) -> isDiagnostic(o, Set.of("error")) ? 1 : -2,
+          (o,p,q) -> isVoidResultSet(o, 1, 1) ? 3 : false,
+          (o,p,q) -> null == o
+        );
+        // done with connection c2 again
+      }
+
+      /*
+       * Make sure the extension drops cleanly and nothing
+       * is left in sqlj.
+       */
+      succeeding &= stateMachine(
+        "drop extension and schema no result",
+        null,
+
+        q(c, "DROP EXTENSION pljava;DROP SCHEMA sqlj")
+        .flatMap(Node::semiFlattenDiagnostics)
+        .peek(Node::peek),
+
+        (o,p,q) -> isDiagnostic(o, Set.of("error")) ? 1 : -2,
+        (o,p,q) -> null == o
+      );
+    }
+
+    /*
+     * Get another new connection and confirm that the old, pre-extension,
+     * LOAD method of installing PL/Java works. It is largely obsolete in
+     * the era of extensions, but still covers the use case of installing
+     * PL/Java without admin access on the server filesystem to where
+     * CREATE EXTENSION requires the files to be; they can still be
+     * installed in some other writable location the server can read, and
+     * pljava.module_path set to the right locations of the jars, and the
+     * correct shared-object path given to LOAD.
+     *
+     * Also test the after-the-fact packaging up with CREATE EXTENSION
+     * FROM unpackaged. That officially goes away in PG 13, where the
+     * equivalent sequence
+     *  CREATE EXTENSION pljava VERSION unpackaged
+     *  \c
+     *  ALTER EXTENSION pljava UPDATE
+     * should be tested instead.
+     */
+    try ( Connection c = n1.connect() )
+    {
+      int majorVersion = c.getMetaData().getDatabaseMajorVersion();
+
+      succeeding &= stateMachine(
+        "load as non-extension",
+        null,
+
+        Node.loadPLJava(c)
+        .flatMap(Node::semiFlattenDiagnostics)
+        .peek(Node::peek),
+
+        (o,p,q) -> isDiagnostic(o, Set.of("error")) ? 1 : -2,
+        (o,p,q) -> null == o
+      );
+
+      if ( 13 <= majorVersion )
+      {
+        succeeding &= stateMachine(
+          "create unpackaged (PG >= 13)",
+          null,
+
+          q(c, "CREATE EXTENSION pljava VERSION unpackaged")
+          .flatMap(Node::semiFlattenDiagnostics)
+          .peek(Node::peek),
+
+          (o,p,q) -> isDiagnostic(o, Set.of("error")) ? 1 : -2,
+          (o,p,q) -> null == o
+        );
+      }
+    }
+
+    /*
+     * CREATE EXTENSION FROM unpackaged (or the second half of the
+     * PG >= 13 CREATE EXTENSION VERSION unpackaged;ALTER EXTENSION UPDATE
+     * sequence) has to happen over a new connection.
+     */
+    try ( Connection c = n1.connect() )
+    {
+      int majorVersion = c.getMetaData().getDatabaseMajorVersion();
+
+      succeeding &= stateMachine(
+        "package after loading",
+        null,
+
+        q(c, 13 > majorVersion
+          ? "CREATE EXTENSION pljava FROM unpackaged"
+          :  "ALTER EXTENSION pljava UPDATE")
+        .flatMap(Node::semiFlattenDiagnostics)
+        .peek(Node::peek),
+
+        (o,p,q) -> isDiagnostic(o, Set.of("error")) ? 1 : -2,
+        (o,p,q) -> null == o
+      );
+
+      /*
+       * Again make sure extension drops cleanly with nothing left behind.
+       */
+      succeeding &= stateMachine(
+        "drop extension and schema no result",
+        null,
+
+        q(c, "DROP EXTENSION pljava;DROP SCHEMA sqlj")
+        .flatMap(Node::semiFlattenDiagnostics)
+        .peek(Node::peek),
+
+        (o,p,q) -> isDiagnostic(o, Set.of("error")) ? 1 : -2,
+        (o,p,q) -> null == o
+      );
     }
   } catch ( Throwable t )
   {