From bdd127a52a50fc2012338f4542c805aa6f57664b Mon Sep 17 00:00:00 2001 From: Malte Mues Date: Wed, 1 Apr 2020 14:53:30 +0200 Subject: [PATCH 1/2] Make test compile pass --- .../iointeraction/CloseOutputStream.scala | 4 ++-- .../iointeraction/CreateFileOutputStream.scala | 13 +++++++------ 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/src/main/scala/org/combinators/websecbench/iointeraction/CloseOutputStream.scala b/src/main/scala/org/combinators/websecbench/iointeraction/CloseOutputStream.scala index 4d28a66..0e94b8a 100644 --- a/src/main/scala/org/combinators/websecbench/iointeraction/CloseOutputStream.scala +++ b/src/main/scala/org/combinators/websecbench/iointeraction/CloseOutputStream.scala @@ -33,8 +33,8 @@ object CloseOutputStream extends TaggedComponent { s""" |private void closeOutputStream(java.io.OutputStream os) { | try { - | if(is != null) { - | is.close(); + | if(os != null) { + | os.close(); | } | } catch (Exception e) { | System.out.println("Couldn't close OutStream"); diff --git a/src/main/scala/org/combinators/websecbench/iointeraction/CreateFileOutputStream.scala b/src/main/scala/org/combinators/websecbench/iointeraction/CreateFileOutputStream.scala index a8cc258..f0aa085 100644 --- a/src/main/scala/org/combinators/websecbench/iointeraction/CreateFileOutputStream.scala +++ b/src/main/scala/org/combinators/websecbench/iointeraction/CreateFileOutputStream.scala @@ -33,18 +33,19 @@ object CreateFileOutputStream extends TaggedComponent{ val createFileInputStream: MethodDeclaration = { Java( s""" - |public java.io.FileOutputStream openFileOutputStream(String filename, HttpServletResponse response) throws java.io.IOException { + |public java.io.FileOutputStream openFileOutputStream(String fileName, HttpServletResponse response) throws java.io.IOException { | java.io.FileOutputStream fos = null; | try { - | fos = new FileOutputStream(fileName, false); - | response.getWriter.println("Now ready to write to file: " + - | org.owasp.esapi.ESAPI.encoder.encodeForHTML(fileName)); - | return fos; + | fos = new java.io.FileOutputStream(fileName, false); + | response.getWriter().println("Now ready to write to file: " + + | org.owasp.esapi.ESAPI.encoder().encodeForHTML(fileName)); | } | catch (Exception e) { | System.out.println("Couldn't open FileOutputStream on file: '" + fileName + "'"); | } - | + | finally{ + | return fos; + | } |} |""".stripMargin).methodDeclarations().head } From ffd43a712eaaa6aad69f23de17afdfbdefacab1f Mon Sep 17 00:00:00 2001 From: Malte Mues Date: Wed, 1 Apr 2020 14:05:56 +0200 Subject: [PATCH 2/2] Create generate-repository.yml This is the first corner stone for setting up CI. --- .github/workflows/generate-repository.yml | 29 +++++++++++++++++++++++ 1 file changed, 29 insertions(+) create mode 100644 .github/workflows/generate-repository.yml diff --git a/.github/workflows/generate-repository.yml b/.github/workflows/generate-repository.yml new file mode 100644 index 0000000..412aa32 --- /dev/null +++ b/.github/workflows/generate-repository.yml @@ -0,0 +1,29 @@ +name: Scala CI + +on: + push: + branches: [ master ] + pull_request: + branches: [ master ] + +jobs: + build: + + runs-on: ubuntu-latest + + steps: + - name: checkout + uses: actions/checkout@v2 + - name: Set up JDK 12 + uses: actions/setup-java@v1.3.0 + with: + java-version: 12 + - name: compile, run, and test + run: | + sbt run && sleep 4m & + sleep 130s + cd /tmp + git clone http://127.0.0.1:9000/benchmark42 benchmark42 + cd /tmp/benchmark42 + sbt compile +