Return correct return code on access error.

Signed-off-by: Mike Ponomarenko <mponomarenko@bloomberg.net>

Author: mponomar

db/comdb2.c

@@ -238,6 +238,7 @@ int64_t gbl_num_auth_allowed = 0;
 int64_t gbl_num_auth_denied = 0;
 int gbl_allow_old_authn = 0;
 int gbl_uses_externalauth = 0;
+int gbl_uses_simpleauth = 0;
 int gbl_uses_externalauth_connect = 0;
 int gbl_externalauth_warn = 0;
 int gbl_identity_cache_max = 500;

db/comdb2.h

@@ -1645,6 +1645,7 @@ extern int gbl_allow_old_authn;
 extern int gbl_uses_password;
 extern int gbl_unauth_tag_access;
 extern int gbl_uses_externalauth;
+extern int gbl_uses_simpleauth;
 extern int gbl_uses_externalauth_connect;
 extern int gbl_externalauth_warn;
 extern int gbl_identity_cache_max;

db/db_access.c

@@ -410,12 +410,15 @@ int access_control_check_write(struct ireq *iq, tran_type *trans, int *bdberr)
     int rc = 0;
 
     if (gbl_uses_externalauth && iq->authdata && externalComdb2AuthenticateUserRead) {
-        return externalComdb2AuthenticateUserWrite(iq->authdata, iq->usedb->tablename, iq->corigin);
+        rc = externalComdb2AuthenticateUserWrite(iq->authdata, iq->usedb->tablename, iq->corigin);
+        if (rc)
+            rc = ERR_ACCESS;
+        return rc;
     }
 
     rc = check_tag_access(iq);
     if (rc)
-        return rc;
+        return ERR_ACCESS;
 
     return 0;
 }
@@ -425,12 +428,15 @@ int access_control_check_read(struct ireq *iq, tran_type *trans, int *bdberr)
     int rc = 0;
 
     if (gbl_uses_externalauth && iq->authdata && externalComdb2AuthenticateUserRead && iq->usedb) {
-        return externalComdb2AuthenticateUserRead(iq->authdata, iq->usedb->tablename, iq->corigin);
+        rc = externalComdb2AuthenticateUserRead(iq->authdata, iq->usedb->tablename, iq->corigin);
+        if (rc)
+            rc = ERR_ACCESS;
+        return rc;
     }
 
     rc = check_tag_access(iq);
     if (rc)
-        return rc;
+        return ERR_ACCESS;
 
     return 0;
 }

db/db_tunables.h

@@ -2586,4 +2586,6 @@ REGISTER_TUNABLE("prefer_non_blocking_coherency_check",
 REGISTER_TUNABLE("new_connection_grace_ms", "Time (in ms) before new connection is eligible for eviction (Default: 100ms)",
                  TUNABLE_INTEGER, &gbl_new_connection_grace_ms, INTERNAL, NULL, NULL, NULL, NULL);
 REGISTER_TUNABLE("accept_headroom", "", TUNABLE_INTEGER, &gbl_accept_headroom, INTERNAL, NULL, NULL, NULL, NULL);
+REGISTER_TUNABLE("simpleauth", NULL, TUNABLE_BOOLEAN, &gbl_uses_simpleauth, NOARG | READEARLY, NULL, NULL, NULL, NULL);
+
 #endif /* _DB_TUNABLES_H */

db/sql.h

@@ -391,6 +391,16 @@ enum {
 enum WriteResponsesEnum { RESPONSE_TYPES };
 #undef XRESPONSE
 
+inline static char *xresponse_type_str(int c)
+{
+#define XRESPONSE(x)                                                                                                   \
+    if (c == x)                                                                                                        \
+        return #x;
+    RESPONSE_TYPES
+#undef XRESPONSE
+    return "???";
+}
+
 /* read response */
 enum {
     RESPONSE_PING_PONG,