Fix SannerFacade#findScriptUrl to extract only the src attribute string

h3xstream#81
MasanoriOnuki · Jun 14, 2024 · b8a2948 · b8a2948
1 parent a8069dd
commit b8a2948
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/retirejs-core/src/main/java/com/h3xstream/retirejs/repo/ScannerFacade.java b/retirejs-core/src/main/java/com/h3xstream/retirejs/repo/ScannerFacade.java
@@ -71,12 +71,15 @@ private List<String> findScriptUrl(String source) {
  Pattern p = Pattern.compile(
  "<script[^>]*" + //script tags
  "src=" + //src attribute
- "[\"']([^>]*)[\"']", //URL between quotes
+ "(?<src>\"[^\"]*?\"|'[^']*?'|\\S+)", //URL between quotes
  Pattern.CASE_INSENSITIVE);
 
  Matcher m = p.matcher(line);
- if(m.find()) {
- String urlScript = m.group(1);
+ if (m.find()) {
+ String src = m.group("src");
+ String urlScript = src.startsWith("\"") || src.startsWith("'")
+ ? src.substring(1, src.length() - 1) // trim quotes
+ : src;
  urls.add(urlScript);
  }
  }