Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add RuntimeClassLoader to grader-api #116

Merged
merged 5 commits into from
Sep 29, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,121 @@
/*
* Jagr - SourceGrade.org
* Copyright (C) 2021-2022 Alexander Staeding
* Copyright (C) 2021-2022 Contributors
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details.
*
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*/

package org.sourcegrade.jagr.core.compiler.java

import org.sourcegrade.jagr.api.testing.ClassTransformer
import org.sourcegrade.jagr.api.testing.RuntimeClassLoader
import org.sourcegrade.jagr.core.transformer.ClassRenamingTransformer
import org.sourcegrade.jagr.core.transformer.transform
import org.sourcegrade.jagr.launcher.io.SerializationScope
import org.sourcegrade.jagr.launcher.io.SerializerFactory
import org.sourcegrade.jagr.launcher.io.get
import java.io.InputStream
import java.net.URL
import java.net.URLConnection
import java.net.URLStreamHandler
import java.util.Collections
import java.util.Enumeration

class RuntimeClassLoaderImpl(
private val runtimeResources: RuntimeResources,
parent: ClassLoader = RuntimeClassLoaderImpl::class.java.classLoader,
) : ClassLoader(parent), RuntimeClassLoader {

@Throws(ClassNotFoundException::class, ClassFormatError::class)
override fun findClass(name: String): Class<*> {
val compiledClass = runtimeResources.classes[name] ?: return super.findClass(name)
val bytecode: ByteArray = compiledClass.bytecode
return defineClass(name, bytecode, 0, bytecode.size)
}

override fun findResource(name: String): URL? {
if (name.endsWith(".class")) {
val className = name.substring(0, name.length - 6).replace('/', '.')
val compiledClass = runtimeResources.classes[className] ?: return super.findResource(name)
return URL(
"jar",
null,
-1,
name,
object : URLStreamHandler() {
override fun openConnection(u: URL?): URLConnection {
return object : URLConnection(u) {
override fun connect() = Unit
override fun getInputStream(): InputStream = compiledClass.bytecode.inputStream()
}
}
}
)
}
val resource: ByteArray = runtimeResources.resources[name] ?: return null
return URL(
null,
"jagrresource:$name",
object : URLStreamHandler() {
override fun openConnection(u: URL?): URLConnection {
return object : URLConnection(u) {
override fun connect() = Unit
override fun getInputStream(): InputStream = resource.inputStream()
}
}
}
)
}

override fun findResources(name: String): Enumeration<URL> {
return Collections.enumeration(listOf(findResource(name) ?: return Collections.emptyEnumeration()))
}

override fun getResourceAsStream(name: String): InputStream? {
if (name.endsWith(".class")) {
val className = name.substring(0, name.length - 6).replace('/', '.')
val compiledClass = runtimeResources.classes[className] ?: return super.getResourceAsStream(name)
return compiledClass.bytecode.inputStream()
}
return runtimeResources.resources[name]?.inputStream() ?: super.getResourceAsStream(name)
}

override fun loadClass(name: String, vararg transformers: ClassTransformer): Class<*> {
return loadClass(name, transformers.asIterable())
}

override fun loadClass(name: String, transformers: Iterable<ClassTransformer>): Class<*> {
val classStream = runtimeResources.classes[name]?.bytecode?.inputStream()
?: getResourceAsStream("${name.replace('.', '/')}.class")
?: throw ClassNotFoundException("Class $name not in submission or parent classloader")
var bytecode: ByteArray = classStream.readAllBytes()
for (transformer in transformers) {
bytecode = transformer.transform(bytecode, this)
}
val newName = "${name}_${System.nanoTime()}"
bytecode = ClassRenamingTransformer(name, newName).transform(bytecode, this)
return defineClass(newName, bytecode, 0, bytecode.size)
}

override fun getClassNames(): Set<String> = runtimeResources.classes.keys
override fun getResourceNames(): Set<String> = runtimeResources.resources.keys

companion object Factory : SerializerFactory<RuntimeClassLoaderImpl> {
override fun read(scope: SerializationScope.Input) = RuntimeClassLoaderImpl(scope[RuntimeResources::class])

override fun write(obj: RuntimeClassLoaderImpl, scope: SerializationScope.Output) {
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ import org.sourcegrade.jagr.core.compiler.InfoJsonResourceExtractor
import org.sourcegrade.jagr.core.compiler.ResourceExtractor
import org.sourcegrade.jagr.core.compiler.java.JavaCompiledContainer
import org.sourcegrade.jagr.core.compiler.java.JavaSourceFile
import org.sourcegrade.jagr.core.compiler.java.RuntimeClassLoader
import org.sourcegrade.jagr.core.compiler.java.RuntimeClassLoaderImpl
import org.sourcegrade.jagr.core.compiler.java.RuntimeJarLoader
import org.sourcegrade.jagr.core.compiler.java.RuntimeResources
import org.sourcegrade.jagr.core.compiler.java.loadCompiled
Expand Down Expand Up @@ -148,7 +148,7 @@ class CompiledBatchFactoryImpl @Inject constructor(
}
val original = runtimeJarLoader.compileSources(replacedSources, libraries)
val transformed = try {
val classLoader = RuntimeClassLoader(original.runtimeResources + libraries)
val classLoader = RuntimeClassLoaderImpl(original.runtimeResources + libraries)
transformerApplier.transform(original, classLoader)
} catch (e: Throwable) {
// create a copy of the original compile result but throw out runtime resources (compiled classes and resources)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ package org.sourcegrade.jagr.core.testing

import org.sourcegrade.jagr.api.testing.Submission
import org.sourcegrade.jagr.api.testing.TestCycle
import org.sourcegrade.jagr.core.compiler.java.RuntimeClassLoader
import org.sourcegrade.jagr.core.compiler.java.RuntimeClassLoaderImpl
import org.sourcegrade.jagr.core.compiler.java.plus

class FallbackRuntimeTester : RuntimeTester {
Expand All @@ -30,7 +30,7 @@ class FallbackRuntimeTester : RuntimeTester {
val rubricProviders = grader.rubricProviders[info.assignmentId] ?: return null
var resources = grader.container.runtimeResources
resources += submission.compileResult.runtimeResources + submission.libraries
val classLoader = RuntimeClassLoader(resources)
val classLoader = RuntimeClassLoaderImpl(resources)
val notes = listOf(
"The grading process was forcibly terminated.",
"Please check if you have an infinite loop or infinite recursion.",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,16 +21,16 @@ package org.sourcegrade.jagr.core.testing

import org.sourcegrade.jagr.api.testing.Submission
import org.sourcegrade.jagr.api.testing.TestCycle
import org.sourcegrade.jagr.core.compiler.java.RuntimeClassLoader
import org.sourcegrade.jagr.core.compiler.java.RuntimeClassLoaderImpl

class FallbackTestCycle(
private val rubricProviderClassNames: List<String>,
private val submission: Submission,
private val classLoader: RuntimeClassLoader,
private val classLoader: RuntimeClassLoaderImpl,
private val notes: List<String>,
) : TestCycle {
override fun getRubricProviderClassNames(): List<String> = rubricProviderClassNames
override fun getClassLoader(): ClassLoader = classLoader
override fun getClassLoader(): RuntimeClassLoaderImpl = classLoader
override fun getSubmission(): Submission = submission
override fun getTestsSucceededCount(): Int = -1
override fun getTestsStartedCount(): Int = -1
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ import org.sourcegrade.jagr.api.rubric.RubricProvider
import org.sourcegrade.jagr.api.rubric.TestForSubmission
import org.sourcegrade.jagr.core.compiler.graderInfo
import org.sourcegrade.jagr.core.compiler.java.JavaCompiledContainer
import org.sourcegrade.jagr.core.compiler.java.RuntimeClassLoader
import org.sourcegrade.jagr.core.compiler.java.RuntimeClassLoaderImpl
import org.sourcegrade.jagr.core.compiler.java.RuntimeResources
import org.sourcegrade.jagr.core.compiler.java.plus
import org.sourcegrade.jagr.launcher.io.GraderJar
Expand Down Expand Up @@ -81,7 +81,7 @@ class GraderJarImpl(
}
val rubricProviders: MutableMap<String, MutableList<String>> = mutableMapOf()
val testProviders: MutableMap<String, MutableList<String>> = mutableMapOf()
val baseClassLoader = RuntimeClassLoader(container.runtimeResources + libraries)
val baseClassLoader = RuntimeClassLoaderImpl(container.runtimeResources + libraries)
for (className in container.runtimeResources.classes.keys) {
val clazz = baseClassLoader.loadClass(className)
rubricProviders.putIfRubric(clazz)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ import org.junit.platform.launcher.core.LauncherFactory
import org.junit.platform.launcher.listeners.SummaryGeneratingListener
import org.sourcegrade.jagr.api.testing.Submission
import org.sourcegrade.jagr.api.testing.TestCycle
import org.sourcegrade.jagr.core.compiler.java.RuntimeClassLoader
import org.sourcegrade.jagr.core.compiler.java.RuntimeClassLoaderImpl
import org.sourcegrade.jagr.core.compiler.java.plus
import org.sourcegrade.jagr.core.executor.TimeoutHandler

Expand All @@ -48,7 +48,7 @@ class JavaRuntimeTester @Inject constructor(
)
return null
}
val classLoader = RuntimeClassLoader(
val classLoader = RuntimeClassLoaderImpl(
submission.compileResult.runtimeResources +
submission.libraries +
grader.containerWithoutSolution.runtimeResources
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,8 @@ data class JavaSubmission(
override fun getInfo(): String = submissionInfo.toString()
override fun getCompileResult(): JavaCompiledContainer = compileResult
override fun getSourceFile(fileName: String): SourceFile? = compileResult.source.sourceFiles[fileName]

@Deprecated("Deprecated in Java")
override fun getClassNames(): Set<String> = Collections.unmodifiableSet(compileResult.runtimeResources.classes.keys)

override fun toString(): String = "$submissionInfo(${compileResult.info.name})"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ package org.sourcegrade.jagr.core.testing

import org.sourcegrade.jagr.api.testing.Submission
import org.sourcegrade.jagr.api.testing.TestCycle
import org.sourcegrade.jagr.core.compiler.java.RuntimeClassLoader
import org.sourcegrade.jagr.core.compiler.java.RuntimeClassLoaderImpl
import org.sourcegrade.jagr.core.compiler.java.RuntimeResources
import org.sourcegrade.jagr.launcher.io.SerializationScope
import org.sourcegrade.jagr.launcher.io.SerializerFactory
Expand All @@ -35,13 +35,13 @@ import org.sourcegrade.jagr.launcher.io.writeList
data class JavaTestCycle(
private val rubricProviderClassNames: List<String>,
private val submission: JavaSubmission,
private val classLoader: RuntimeClassLoader,
private val classLoader: RuntimeClassLoaderImpl,
private var testsSucceededCount: Int = -1,
private var testsStartedCount: Int = -1,
) : TestCycle {
private var jUnitResult: TestCycle.JUnitResult? = null
override fun getRubricProviderClassNames(): List<String> = rubricProviderClassNames
override fun getClassLoader(): ClassLoader = classLoader
override fun getClassLoader(): RuntimeClassLoaderImpl = classLoader
override fun getSubmission(): JavaSubmission = submission
override fun getTestsSucceededCount(): Int = testsSucceededCount
override fun getTestsStartedCount(): Int = testsStartedCount
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
/*
* Jagr - SourceGrade.org
* Copyright (C) 2021-2022 Alexander Staeding
* Copyright (C) 2021-2022 Contributors
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details.
*
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*/

package org.sourcegrade.jagr.core.transformer

import org.objectweb.asm.ClassReader
import org.objectweb.asm.ClassVisitor
import org.objectweb.asm.ClassWriter
import org.objectweb.asm.Opcodes
import org.sourcegrade.jagr.api.testing.ClassTransformer

class ClassRenamingTransformer(
oldName: String,
newName: String,
) : ClassTransformer {
// normalize names
private val oldName = oldName.replace('.', '/')
private val newName = newName.replace('.', '/')
private val name = "$oldName-renamed-to-$newName"
override fun getName(): String = name
override fun transform(reader: ClassReader, writer: ClassWriter) {
if (reader.className == oldName) {
reader.accept(RenamingVisitor(writer), 0)
} else {
reader.accept(writer, 0)
}
}
private inner class RenamingVisitor(classVisitor: ClassVisitor?) : ClassVisitor(Opcodes.ASM9, classVisitor) {
override fun visit(version: Int, access: Int, name: String, signature: String?, superName: String, interfaces: Array<String>) {
super.visit(version, access, newName, signature, superName, interfaces)
}
}
}
Loading