From 6079ec3a1381d06edbde5b1343b452a7db706e44 Mon Sep 17 00:00:00 2001
From: Jonathan Cobb <jonathan@kyuss.org>
Date: Mon, 6 Jan 2020 10:57:17 -0500
Subject: [PATCH] consolidate invalidName check

---
 .../wizard/server/listener/SystemInitializerListener.java      | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/wizard-server/src/main/java/org/cobbzilla/wizard/server/listener/SystemInitializerListener.java b/wizard-server/src/main/java/org/cobbzilla/wizard/server/listener/SystemInitializerListener.java
index 868f14f..228bd7f 100644
--- a/wizard-server/src/main/java/org/cobbzilla/wizard/server/listener/SystemInitializerListener.java
+++ b/wizard-server/src/main/java/org/cobbzilla/wizard/server/listener/SystemInitializerListener.java
@@ -107,7 +107,6 @@ public class SystemInitializerListener extends RestServerLifecycleListenerBase {
     public boolean checkTable(PgRestServerConfiguration config) {
         if (checkTable) {
             final String tableName = getCheckTableName(config);
-            if (!checkSafeShellArg(tableName)) invalidName("invalid table name", tableName);
             try {
                 return runTableCheck(config, tableName);
             } catch (Exception e) {
@@ -119,6 +118,7 @@ public class SystemInitializerListener extends RestServerLifecycleListenerBase {
     }
 
     public boolean runTableCheck(PgRestServerConfiguration config, String tableName) {
+        if (!checkSafeShellArg(tableName)) invalidName("invalid table name", tableName);
         final ResultSetBean rs = config.execSql("select * from " + tableName + " limit 1");
         return rs != null && rs.rowCount() <= 1;
     }
@@ -127,7 +127,6 @@ public class SystemInitializerListener extends RestServerLifecycleListenerBase {
         if (checkTable) {
             final PgRestServerConfiguration config = (PgRestServerConfiguration) server.getConfiguration();
             final String tableName = getCheckTableName(config);
-            if (!checkSafeShellArg(tableName)) invalidName("invalid table name", tableName);
             try {
                 runTableCheck(config, tableName);
             } catch (Exception e) {