Add tests for StandardSystemProperty

Author: JLLeitschuh

java/ql/lib/semmle/code/java/environment/SystemProperty.qll

@@ -170,8 +170,18 @@ private MethodAccess getSystemPropertyFromApacheFileUtils(string propertyName) {
 private MethodAccess getSystemPropertyFromGuava(string propertyName) {
   exists(EnumConstant ec |
     ec.getDeclaringType().hasQualifiedName("com.google.common.base", "StandardSystemProperty") and
-    result.getQualifier() = ec.getAnAccess() and
-    result.getMethod().hasName("value")
+    // Example: `StandardSystemProperty.JAVA_IO_TMPDIR.value()`
+    (
+      localExprFlowPlusInitializers(ec.getAnAccess(), result.getQualifier()) and
+      result.getMethod().hasName("value")
+    )
+    or
+    // Example: `System.getProperty(StandardSystemProperty.JAVA_IO_TMPDIR.key())`
+    exists(MethodAccess keyMa |
+      localExprFlowPlusInitializers(ec.getAnAccess(), keyMa.getQualifier()) and
+      keyMa.getMethod().hasName("key") and
+      localExprFlowPlusInitializers(keyMa, result.(MethodAccessSystemGetProperty).getArgument(0))
+    )
   |
     ec.hasName("JAVA_VERSION") and propertyName = "java.version"
     or

java/ql/test/library-tests/environment/SystemPropertyAccess.java

@@ -1,6 +1,7 @@
 import java.io.File;
 import java.util.Properties;
 import org.apache.commons.lang3.SystemUtils;
+import com.google.common.base.StandardSystemProperty;
 
 public class SystemPropertyAccess {
     private static final Properties SYSTEM_PROPERTIES = System.getProperties();
@@ -20,6 +21,10 @@ void test() {
         char separatorChar = File.separatorChar;
         String pathSeparator = File.pathSeparator;
         char pathSeparatorChar = File.pathSeparatorChar;
+        StandardSystemProperty.JAVA_VERSION.value();
+        StandardSystemProperty property = StandardSystemProperty.JAVA_VERSION;
+        property.value();
+        System.getProperty(StandardSystemProperty.JAVA_IO_TMPDIR.key());
     }
 
 }

java/ql/test/library-tests/environment/SystemPropertyTest.expected

@@ -38,15 +38,20 @@
 | ../../stubs/apache-commons-lang3-3.7/org/apache/commons/lang3/SystemUtils.java:843:5:843:48 | USER_NAME | user.name |
 | ../../stubs/apache-commons-lang3-3.7/org/apache/commons/lang3/SystemUtils.java:861:5:861:52 | USER_TIMEZONE | user.timezone |
 | ../../stubs/apache-commons-lang3-3.7/org/apache/commons/lang3/SystemUtils.java:1762:47:1762:63 | JAVA_AWT_HEADLESS | java.awt.headless |
-| SystemPropertyAccess.java:9:9:9:37 | getProperty(...) | os.name |
-| SystemPropertyAccess.java:10:9:10:48 | getProperty(...) | os.name |
-| SystemPropertyAccess.java:11:9:11:53 | getProperty(...) | os.name |
-| SystemPropertyAccess.java:12:9:12:52 | get(...) | java.io.tmpdir |
-| SystemPropertyAccess.java:15:9:15:30 | lineSeparator(...) | line.separator |
-| SystemPropertyAccess.java:16:29:16:51 | SystemUtils.AWT_TOOLKIT | awt.toolkit |
-| SystemPropertyAccess.java:17:31:17:55 | SystemUtils.FILE_ENCODING | file.encoding |
-| SystemPropertyAccess.java:18:25:18:50 | SystemUtils.JAVA_IO_TMPDIR | java.io.tmpdir |
-| SystemPropertyAccess.java:19:28:19:41 | File.separator | file.separator |
-| SystemPropertyAccess.java:20:30:20:47 | File.separatorChar | file.separator |
-| SystemPropertyAccess.java:21:32:21:49 | File.pathSeparator | path.separator |
-| SystemPropertyAccess.java:22:34:22:55 | File.pathSeparatorChar | path.separator |
+| SystemPropertyAccess.java:10:9:10:37 | getProperty(...) | os.name |
+| SystemPropertyAccess.java:11:9:11:48 | getProperty(...) | os.name |
+| SystemPropertyAccess.java:12:9:12:53 | getProperty(...) | os.name |
+| SystemPropertyAccess.java:13:9:13:52 | get(...) | java.io.tmpdir |
+| SystemPropertyAccess.java:14:9:14:50 | getProperty(...) | java.home |
+| SystemPropertyAccess.java:15:9:15:46 | get(...) | file.encoding |
+| SystemPropertyAccess.java:16:9:16:30 | lineSeparator(...) | line.separator |
+| SystemPropertyAccess.java:17:29:17:51 | SystemUtils.AWT_TOOLKIT | awt.toolkit |
+| SystemPropertyAccess.java:18:31:18:55 | SystemUtils.FILE_ENCODING | file.encoding |
+| SystemPropertyAccess.java:19:25:19:50 | SystemUtils.JAVA_IO_TMPDIR | java.io.tmpdir |
+| SystemPropertyAccess.java:20:28:20:41 | File.separator | file.separator |
+| SystemPropertyAccess.java:21:30:21:47 | File.separatorChar | file.separator |
+| SystemPropertyAccess.java:22:32:22:49 | File.pathSeparator | path.separator |
+| SystemPropertyAccess.java:23:34:23:55 | File.pathSeparatorChar | path.separator |
+| SystemPropertyAccess.java:24:9:24:51 | value(...) | java.version |
+| SystemPropertyAccess.java:26:9:26:24 | value(...) | java.version |
+| SystemPropertyAccess.java:27:9:27:71 | getProperty(...) | java.io.tmpdir |

java/ql/test/library-tests/environment/options

@@ -1 +1 @@
-//semmle-extractor-options: --javac-args -cp ${testdir}/../../stubs/apache-commons-lang3-3.7/
+//semmle-extractor-options: --javac-args -cp ${testdir}/../../stubs/apache-commons-lang3-3.7/:${testdir}/../../stubs/guava-30.0/