Merge pull request github#11246 from erik-krogh/java-redosMod

Java: use the shared regex pack

Author: erik-krogh

java/ql/lib/change-notes/2022-10-31-shared-redos-pack.md

@@ -0,0 +1,4 @@
+---
+ category: minorAnalysis
+---
+ * The ReDoS libraries in `semmle.code.java.security.regexp` has been moved to a shared pack inside the `shared/` folder, and the previous location has been deprecated.

java/ql/lib/qlpack.yml

@@ -5,3 +5,5 @@ dbscheme: config/semmlecode.dbscheme
 extractor: java
 library: true
 upgrades: upgrades
+dependencies:
+  codeql/regex: ${workspace}

java/ql/lib/semmle/code/java/PrintAst.qll

@@ -7,7 +7,7 @@
  */
 
 import java
-import semmle.code.java.regex.RegexTreeView
+import semmle.code.java.regex.RegexTreeView as RegexTreeView
 
 private newtype TPrintAstConfiguration = MkPrintAstConfiguration()
 
@@ -134,8 +134,10 @@ private newtype TPrintAstNode =
   TImportsNode(CompilationUnit cu) {
     shouldPrint(cu, _) and exists(Import i | i.getCompilationUnit() = cu)
   } or
-  TRegExpTermNode(RegExpTerm term) {
-    exists(StringLiteral str | term.getRootTerm() = getParsedRegExp(str) and shouldPrint(str, _))
+  TRegExpTermNode(RegexTreeView::RegExpTerm term) {
+    exists(StringLiteral str |
+      term.getRootTerm() = RegexTreeView::getParsedRegExp(str) and shouldPrint(str, _)
+    )
   }
 
 /**
@@ -316,20 +318,20 @@ final class StringLiteralNode extends ExprStmtNode {
 
   override PrintAstNode getChild(int childIndex) {
     childIndex = 0 and
-    result.(RegExpTermNode).getTerm() = getParsedRegExp(element)
+    result.(RegExpTermNode).getTerm() = RegexTreeView::getParsedRegExp(element)
   }
 }
 
 /**
  * A node representing a regular expression term.
  */
 class RegExpTermNode extends TRegExpTermNode, PrintAstNode {
-  RegExpTerm term;
+  RegexTreeView::RegExpTerm term;
 
   RegExpTermNode() { this = TRegExpTermNode(term) }
 
   /** Gets the `RegExpTerm` for this node. */
-  RegExpTerm getTerm() { result = term }
+  RegexTreeView::RegExpTerm getTerm() { result = term }
 
   override PrintAstNode getChild(int childIndex) {
     result.(RegExpTermNode).getTerm() = term.getChild(childIndex)