Merge ~cjwatson/lp-signing:db-grants into lp-signing:master

[Colin Watson]

Grant the application access to database tables

Otherwise it can't do very much.

[Tom Wardill (twom)]

review: Approve

[Otto Co-Pilot (otto-copilot)]

Running landing tests failed
https://jenkins.ols.canonical.com/online-services/job/lp-signing/20/

[Otto Co-Pilot (otto-copilot)]

Running landing tests failed
https://jenkins.ols.canonical.com/online-services/job/lp-signing/21/

1f4569e... by Colin Watson on 2020-04-20

Fix local DB name in config and tests

diff --git a/Makefile.db b/Makefile.db
index dd8d4c7..980a815 100644
--- a/Makefile.db
+++ b/Makefile.db
@@ -1,7 +1,7 @@
-PGNAME = lp_signing
+PGNAME = lp-signing
 PGHOST = $(shell pwd)/dev-db/localhost
-PGUSER = lp_signing
-PGUSER_ADMIN = lp_signing_admin
+PGUSER = lp-signing
+PGUSER_ADMIN = lp-signing_admin
 DATA_DIR = $(PGHOST)/data
 LOG_FILE = $(PGHOST)/postgresql.log
 CONF_FILE = $(PGHOST)/postgresql.conf
diff --git a/lp_signing/config.py b/lp_signing/config.py
index 2c4036b..be8403a 100644
--- a/lp_signing/config.py
+++ b/lp_signing/config.py
@@ -21,7 +21,7 @@ _test_db_path = str(ROOT / "dev-db" / "localhost")
 
 DEFAULT_TEST_CONFIG = {
     "database": {
-        "master_url": f"postgres://{quote(_test_db_path, safe='')}/lp_signing",
+        "master_url": f"postgres://{quote(_test_db_path, safe='')}/lp-signing",
         "standby_urls": "[]",
         },
     "auth": {
diff --git a/lp_signing/database/tests/test_enumcol.py b/lp_signing/database/tests/test_enumcol.py
index ac65e30..ea5ba1f 100644
--- a/lp_signing/database/tests/test_enumcol.py
+++ b/lp_signing/database/tests/test_enumcol.py
@@ -69,8 +69,8 @@ class TestDBEnum(TestCase):
                 foo integer DEFAULT 1 NOT NULL
             );
             """)
-        store.execute("GRANT ALL ON TABLE FooTest TO lp_signing;")
-        store.execute("GRANT ALL ON footest_id_seq TO lp_signing;")
+        store.execute('GRANT ALL ON TABLE FooTest TO "lp-signing";')
+        store.execute('GRANT ALL ON footest_id_seq TO "lp-signing";')
         self.addCleanup(store.execute, "DROP TABLE FooTest;")
 
     def test_enumerated_type_must_be_DBEnumeratedType(self):
diff --git a/lp_signing/tests/test_webapp.py b/lp_signing/tests/test_webapp.py
index b555463..9857263 100644
--- a/lp_signing/tests/test_webapp.py
+++ b/lp_signing/tests/test_webapp.py
@@ -53,7 +53,7 @@ class TestConfiguration(TestCase):
             MatchesStructure.byEquality(
                 scheme="postgres",
                 hostname=quote(str(root / "dev-db" / "localhost"), safe=""),
-                path="/lp_signing"))
+                path="/lp-signing"))
 
     def test_binds_no_standbys(self):
         fixture = self.useFixture(AppFixture())
diff --git a/migrations/patch-0-1-1-std.sql b/migrations/patch-0-1-1-std.sql
 new file mode 100644
index 0000000..6d0b462
--- /dev/null
+++ b/migrations/patch-0-1-1-std.sql
@@ -0,0 +1,14 @@
+GRANT SELECT, INSERT, UPDATE, DELETE ON nonce TO "lp-signing";
+GRANT USAGE ON nonce_id_seq TO "lp-signing";
+
+GRANT SELECT, INSERT, UPDATE, DELETE ON client TO "lp-signing";
+GRANT USAGE ON client_id_seq TO "lp-signing";
+
+GRANT SELECT, INSERT, UPDATE, DELETE ON clientpublickey TO "lp-signing";
+GRANT USAGE ON clientpublickey_id_seq TO "lp-signing";
+
+GRANT SELECT, INSERT, UPDATE, DELETE ON key TO "lp-signing";
+GRANT USAGE ON key_id_seq TO "lp-signing";
+
+GRANT SELECT, INSERT, UPDATE, DELETE ON keyauthorization TO "lp-signing";
+GRANT USAGE ON keyauthorization_id_seq TO "lp-signing";
diff --git a/service.conf b/service.conf
index ea0de24..8751c72 100644
--- a/service.conf
+++ b/service.conf
@@ -1,5 +1,5 @@
 [database]
-master_url: postgres://%(QUOTED_TEST_DB_PATH)s/lp_signing
+master_url: postgres://%(QUOTED_TEST_DB_PATH)s/lp-signing
 standby_urls: []
 
 [auth]