hans/Nominatim
1
0
Fork 1
mirror of https://github.com/osm-search/Nominatim.git synced 2026-03-07 10:34:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

properly grant rights to read-only user when switching out word table

Browse Source
This commit is contained in:
Sarah Hoffmann
2024-02-06 17:30:01 +01:00
parent 39039e2a55
commit bc51378aee
1 changed files with 16 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
nominatim/tokenizer/icu_tokenizer.py
View File

@@ -67,7 +67,7 @@ class ICUTokenizer(AbstractTokenizer):
if init_db: if init_db:
self.update_sql_functions(config) self.update_sql_functions(config)
self._setup_db_tables(config, 'word') self._setup_db_tables(config)
self._create_base_indices(config, 'word') self._create_base_indices(config, 'word')
@@ -128,6 +128,10 @@ class ICUTokenizer(AbstractTokenizer):
FROM word LEFT JOIN word_frequencies wf FROM word LEFT JOIN word_frequencies wf
ON word.word_id = wf.id""") ON word.word_id = wf.id""")
cur.drop_table('word_frequencies') cur.drop_table('word_frequencies')
sqlp = SQLPreprocessor(conn, config)
sqlp.run_string(conn,
'GRANT SELECT ON tmp_word TO "{{config.DATABASE_WEBUSER}}"')
conn.commit() conn.commit()
self._create_base_indices(config, 'tmp_word') self._create_base_indices(config, 'tmp_word')
self._create_lookup_indices(config, 'tmp_word') self._create_lookup_indices(config, 'tmp_word')
@@ -234,28 +238,29 @@ class ICUTokenizer(AbstractTokenizer):
self.loader.save_config_to_db(conn) self.loader.save_config_to_db(conn)
def _setup_db_tables(self, config: Configuration, table_name: str) -> None: def _setup_db_tables(self, config: Configuration) -> None:
""" Set up the word table and fill it with pre-computed word """ Set up the word table and fill it with pre-computed word
frequencies. frequencies.
""" """
with connect(self.dsn) as conn: with connect(self.dsn) as conn:
with conn.cursor() as cur: with conn.cursor() as cur:
cur.drop_table(table_name) cur.drop_table('word')
sqlp = SQLPreprocessor(conn, config) sqlp = SQLPreprocessor(conn, config)
sqlp.run_string(conn, """ sqlp.run_string(conn, """
CREATE TABLE {{table_name}} ( CREATE TABLE word (
word_id INTEGER, word_id INTEGER,
word_token text NOT NULL, word_token text NOT NULL,
type text NOT NULL, type text NOT NULL,
word text, word text,
info jsonb info jsonb
) {{db.tablespace.search_data}}; ) {{db.tablespace.search_data}};
GRANT SELECT ON {{table_name}} TO "{{config.DATABASE_WEBUSER}}"; GRANT SELECT ON word TO "{{config.DATABASE_WEBUSER}}";
DROP SEQUENCE IF EXISTS seq_{{table_name}}; DROP SEQUENCE IF EXISTS seq_word;
CREATE SEQUENCE seq_{{table_name}} start 1; CREATE SEQUENCE seq_word start 1;
GRANT SELECT ON seq_{{table_name}} to "{{config.DATABASE_WEBUSER}}"; GRANT SELECT ON seq_word to "{{config.DATABASE_WEBUSER}}";
""", table_name=table_name) """)
conn.commit()
def _create_base_indices(self, config: Configuration, table_name: str) -> None: def _create_base_indices(self, config: Configuration, table_name: str) -> None:
@@ -276,6 +281,7 @@ class ICUTokenizer(AbstractTokenizer):
""", """,
table_name=table_name, idx_name=name, table_name=table_name, idx_name=name,
column_type=ctype) column_type=ctype)
conn.commit()
def _create_lookup_indices(self, config: Configuration, table_name: str) -> None: def _create_lookup_indices(self, config: Configuration, table_name: str) -> None:
@@ -289,6 +295,7 @@ class ICUTokenizer(AbstractTokenizer):
ON {{table_name}} USING BTREE (word_id) {{db.tablespace.search_index}} ON {{table_name}} USING BTREE (word_id) {{db.tablespace.search_index}}
""", """,
table_name=table_name) table_name=table_name)
conn.commit()
def _move_temporary_word_table(self, old: str) -> None: def _move_temporary_word_table(self, old: str) -> None: