Properly handle invalid characters in identifiers for Wordpress

kamax-matrix · Apr 2, 2018 · 91ccb75 · 91ccb75
1 parent ac6f549
commit 91ccb75
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 4 deletions.
diff --git a/src/main/java/io/kamax/mxisd/backend/wordpress/WordpressDirectoryProvider.java b/src/main/java/io/kamax/mxisd/backend/wordpress/WordpressDirectoryProvider.java
@@ -83,8 +83,12 @@ public UserDirectorySearchResult search(String searchTerm, String query) {
 
                     while (rSet.next()) {
                         processRow(rSet).ifPresent(e -> {
-                            e.setUserId(MatrixID.from(e.getUserId(), mxCfg.getDomain()).valid().getId());
-                            result.addResult(e);
+                            try {
+                                e.setUserId(MatrixID.from(e.getUserId(), mxCfg.getDomain()).valid().getId());
+                                result.addResult(e);
+                            } catch (IllegalArgumentException ex) {
+                                log.warn("Ignoring result {} - Invalid characters for a Matrix ID", e.getUserId());
+                            }
                         });
                     }
 

diff --git a/src/main/java/io/kamax/mxisd/backend/wordpress/WordpressThreePidProvider.java b/src/main/java/io/kamax/mxisd/backend/wordpress/WordpressThreePidProvider.java
@@ -87,10 +87,14 @@ protected Optional<_MatrixID> find(ThreePid tpid) {
                 while (rSet.next()) {
                     String uid = rSet.getString("uid");
                     log.info("Found match: {}", uid);
-                    return Optional.of(MatrixID.from(uid, mxCfg.getDomain()).valid());
+                    try {
+                        return Optional.of(MatrixID.from(uid, mxCfg.getDomain()).valid());
+                    } catch (IllegalArgumentException ex) {
+                        log.warn("Ignoring match {} - Invalid characters for a Matrix ID", uid);
+                    }
                 }
 
-                log.info("No match found in Wordpress");
+                log.info("No valid match found in Wordpress");
                 return Optional.empty();
             }
         } catch (SQLException e) {