Merge pull request #40 from ls1intum/last-pushes-before-testing-session

Last pushes before testing session
ls1intum · Dec 6, 2024 · a3e384d · a3e384d
2 parents 85e8d24 + 8127354
commit a3e384d
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 9 deletions.
diff --git a/...se/ares/api/aop/java/instrumentation/pointcut/JavaInstrumentationPointcutDefinitions.java b/...se/ares/api/aop/java/instrumentation/pointcut/JavaInstrumentationPointcutDefinitions.java
@@ -142,7 +142,9 @@ static ElementMatcher<MethodDescription> getMethodsMatcher(
             "java.io.BufferedReader",
             List.of("lines"),
             "java.nio.channels.FileChannel",
-            List.of("open")
+            List.of("open"),
+            "java.nio.file.spi.FileSystemProvider",
+            List.of("newFileChannel")
     );
     //</editor-fold>
 
@@ -167,9 +169,7 @@ static ElementMatcher<MethodDescription> getMethodsMatcher(
             "java.nio.file.Files",
             List.of("write", "writeString", "newOutputStream", "writeBytes", "writeAllBytes", "writeLines"),
             "java.io.File",
-            List.of("setWritable"),
-            "java.nio.channels.FileChannel",
-            List.of("open")
+            List.of("setWritable")
 
     );
     //</editor-fold>

diff --git a/...java/de/tum/cit/ase/ares/api/securitytest/java/JavaSecurityTestCaseFactoryAndBuilder.java b/...java/de/tum/cit/ase/ares/api/securitytest/java/JavaSecurityTestCaseFactoryAndBuilder.java
@@ -7,11 +7,9 @@
 import com.tngtech.archunit.core.domain.JavaClasses;
 import com.tngtech.archunit.core.importer.ClassFileImporter;
 import de.tum.cit.ase.ares.api.aop.java.JavaSecurityTestCaseSupported;
-import de.tum.cit.ase.ares.api.architecture.ArchitectureSecurityTestCase;
 import de.tum.cit.ase.ares.api.architecture.java.CallGraphBuilderUtils;
 import de.tum.cit.ase.ares.api.architecture.java.JavaArchitecturalTestCaseSupported;
 import de.tum.cit.ase.ares.api.architecture.java.JavaArchitectureTestCase;
-import de.tum.cit.ase.ares.api.architecture.java.archunit.JavaArchUnitSecurityTestCase;
 import de.tum.cit.ase.ares.api.aop.java.JavaSecurityTestCase;
 import de.tum.cit.ase.ares.api.policy.SecurityPolicy;
 import de.tum.cit.ase.ares.api.policy.SecurityPolicy.ResourceAccesses;
@@ -215,6 +213,7 @@ private void createSecurityTestCases() {
                 new SecurityPolicy.PackagePermission("org.java.aspectj"),
                 new SecurityPolicy.PackagePermission("org.aspectj"),
                 new SecurityPolicy.PackagePermission("de.tum.cit.ase.ares.api.aop.java.aspectj.adviceandpointcut")));
+                new SecurityPolicy.PackagePermission(packageName);
         //</editor-fold>
 
         //<editor-fold desc="Create variable rules code">

diff --git a/...esources/de/tum/cit/ase/ares/api/templates/architecture/java/wala/methods/classloader.txt b/...esources/de/tum/cit/ase/ares/api/templates/architecture/java/wala/methods/classloader.txt
@@ -27,4 +27,6 @@ java.lang.System.setProperties(Ljava/util/Properties;)
 java.util.ResourceBundle.getBundle
 java.lang.System.setErr
 java.lang.System.setIn
-java.lang.System.setOut
+java.lang.System.setOut
+java.lang.Runtime.loadLibrary0
+java.lang.Runtime.load0
diff --git a/...es/integration/testuser/subject/architectureTests/fileSystem/FileSystemAccessPenguin.java b/...es/integration/testuser/subject/architectureTests/fileSystem/FileSystemAccessPenguin.java
@@ -123,7 +123,7 @@ public static void accessFileSystemViaInputStreamReader() throws IOException {
      * Access the file system using the {@link FileChannel} class for reading.
      */
     public static void accessFileSystemViaFileChannelRead() throws IOException {
-        FileChannel fileChannel = FileChannel.open(Path.of("pom123.xml"));
+        FileChannel fileChannel = FileChannel.open(Path.of("pom123.xml"), StandardOpenOption.READ);
         fileChannel.read(ByteBuffer.allocate(10));
     }
 
@@ -228,7 +228,7 @@ public static void accessFileSystemViaPrintStream() throws FileNotFoundException
      * Access the file system using the {@link FileChannel} class for writing.
      */
     public static void accessFileSystemViaFileChannelWrite() throws IOException {
-        FileChannel fileChannel = FileChannel.open(Path.of("pom123.xml"));
+        FileChannel fileChannel = FileChannel.open(Path.of("pom123.xml"), StandardOpenOption.WRITE);
         fileChannel.write(ByteBuffer.allocate(10));
     }