Merge pull request #358 from diffix/cristian/bugfix

Skip non-associated databases from filtering.

Author: cristianberneanu

pg_diffix/config.h

@@ -42,4 +42,9 @@ extern void config_init(void);
  */
 extern void config_validate(void);
 
+/*
+ * Returns true if the extension was activated for the current database.
+ */
+extern bool is_pg_diffix_active(void);
+
 #endif /* PG_DIFFIX_CONFIG_H */

src/auth.c

@@ -79,6 +79,10 @@ AccessLevel get_user_access_level(void)
 
 AccessLevel get_session_access_level(void)
 {
+  /* If the extension wasn't activated, force the current session into direct access mode. */
+  if (!is_pg_diffix_active())
+    return ACCESS_DIRECT;
+
   AccessLevel user_level = get_user_access_level();
   if (is_higher_access_level(g_config.session_access_level, user_level))
   {

src/config.c

@@ -1,5 +1,6 @@
 #include "postgres.h"
 
+#include "commands/extension.h"
 #include "fmgr.h"
 #include "lib/stringinfo.h"
 #include "miscadmin.h"
@@ -63,6 +64,13 @@ static bool session_access_level_check(int *newval, void **extra, GucSource sour
   if (g_initializing)
     return true;
 
+  if (!is_pg_diffix_active())
+  {
+    GUC_check_errmsg_string = "Invalid operation requested for the current session.";
+    GUC_check_errdetail_string = "pg_diffix wasn't activated for the current database.";
+    return false;
+  }
+
   AccessLevel user_level = get_user_access_level();
   if (is_higher_access_level(*newval, user_level))
   {
@@ -414,3 +422,8 @@ void config_validate(void)
   if (g_config.strict && g_config.outlier_count_max - g_config.outlier_count_min < MIN_STRICT_INTERVAL_SIZE)
     FAILWITH("pg_diffix is misconfigured: outlier_count_max - outlier_count_min < %d.", MIN_STRICT_INTERVAL_SIZE);
 }
+
+bool is_pg_diffix_active(void)
+{
+  return OidIsValid(get_extension_oid("pg_diffix", true));
+}

src/pg_diffix.c

@@ -22,7 +22,7 @@ void _PG_fini(void);
 
 void _PG_init(void)
 {
-  DEBUG_LOG("Activating Diffix extension...");
+  DEBUG_LOG("Initializing Diffix extension...");
 
   auth_init();
   config_init();