public
/
openhab-addons
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Fixes #14053

Signed-off-by: Jacob Laursen <jacob-github@vindvejr.dk>
This commit is contained in:
Jacob Laursen 2022-12-27 11:41:59 +01:00 committed by GitHub
parent e7938ae357
commit 0b59be62b6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
bundles/org.openhab.persistence.jdbc/src/main/java/org/openhab/persistence/jdbc/internal/JdbcMapper.java
View File

@ -27,6 +27,7 @@ import org.eclipse.jdt.annotation.Nullable;
import org.knowm.yank.Yank; import org.knowm.yank.Yank;
import org.openhab.core.i18n.TimeZoneProvider; import org.openhab.core.i18n.TimeZoneProvider;
import org.openhab.core.items.Item; import org.openhab.core.items.Item;
import org.openhab.core.items.ItemUtil;
import org.openhab.core.persistence.FilterCriteria; import org.openhab.core.persistence.FilterCriteria;
import org.openhab.core.persistence.HistoricItem; import org.openhab.core.persistence.HistoricItem;
import org.openhab.core.persistence.PersistenceItemInfo; import org.openhab.core.persistence.PersistenceItemInfo;
@ -340,6 +341,11 @@ public class JdbcMapper {
} }
} else { } else {
for (ItemsVO vo : getItemIDTableNames()) { for (ItemsVO vo : getItemIDTableNames()) {
String itemName = vo.getItemName();
if (!ItemUtil.isValidItemName(itemName)) {
logger.warn("Skipping invalid item name {}", itemName);
continue;
}
itemNameToTableNameMap.put(vo.getItemName(), itemNameToTableNameMap.put(vo.getItemName(),
namingStrategy.getTableName(vo.getItemId(), vo.getItemName())); namingStrategy.getTableName(vo.getItemId(), vo.getItemName()));
} }
@ -429,6 +435,10 @@ public class JdbcMapper {
} }
oldNewTableNames = new ArrayList<>(); oldNewTableNames = new ArrayList<>();
for (String itemName : itemTables) { for (String itemName : itemTables) {
if (!ItemUtil.isValidItemName(itemName)) {
logger.warn("JDBC::formatTableNames: Skipping invalid item name {}", itemName);
continue;
}
ItemsVO isvo = new ItemsVO(); ItemsVO isvo = new ItemsVO();
isvo.setItemName(itemName); isvo.setItemName(itemName);
isvo.setItemsManageTable(conf.getItemsManageTable()); isvo.setItemsManageTable(conf.getItemsManageTable());