Skip loading/migrating items with invalid name (openhab#14054)

Fixes openhab#14053 Signed-off-by: Jacob Laursen <[email protected]>
andrewfg · Dec 27, 2022 · 0b59be6 · 0b59be6
1 parent e7938ae
commit 0b59be6
Showing 1 changed file with 10 additions and 0 deletions.
diff --git a/...nhab.persistence.jdbc/src/main/java/org/openhab/persistence/jdbc/internal/JdbcMapper.java b/...nhab.persistence.jdbc/src/main/java/org/openhab/persistence/jdbc/internal/JdbcMapper.java
@@ -27,6 +27,7 @@
 import org.knowm.yank.Yank;
 import org.openhab.core.i18n.TimeZoneProvider;
 import org.openhab.core.items.Item;
+import org.openhab.core.items.ItemUtil;
 import org.openhab.core.persistence.FilterCriteria;
 import org.openhab.core.persistence.HistoricItem;
 import org.openhab.core.persistence.PersistenceItemInfo;
@@ -340,6 +341,11 @@ public void populateItemNameToTableNameMap() throws JdbcSQLException {
             }
         } else {
             for (ItemsVO vo : getItemIDTableNames()) {
+                String itemName = vo.getItemName();
+                if (!ItemUtil.isValidItemName(itemName)) {
+                    logger.warn("Skipping invalid item name {}", itemName);
+                    continue;
+                }
                 itemNameToTableNameMap.put(vo.getItemName(),
                         namingStrategy.getTableName(vo.getItemId(), vo.getItemName()));
             }
@@ -429,6 +435,10 @@ private void formatTableNames() throws JdbcSQLException {
             }
             oldNewTableNames = new ArrayList<>();
             for (String itemName : itemTables) {
+                if (!ItemUtil.isValidItemName(itemName)) {
+                    logger.warn("JDBC::formatTableNames: Skipping invalid item name {}", itemName);
+                    continue;
+                }
                 ItemsVO isvo = new ItemsVO();
                 isvo.setItemName(itemName);
                 isvo.setItemsManageTable(conf.getItemsManageTable());