Skip to content

Commit e791cb8

Browse files
daniel-kmiecikdjankows
authored andcommitted
Merge branch 'master' into security-issues-for-swagger-codegen
2 parents 62f2eb9 + ca64689 commit e791cb8

File tree

2 files changed

+7
-3
lines changed

2 files changed

+7
-3
lines changed

.github/workflows/codeql.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,10 @@
1212
name: "CodeQL"
1313

1414
on:
15+
pull_request:
16+
branches: [ "master" ]
17+
push:
18+
branches: [ "master" ]
1519
schedule:
1620
- cron: '16 04 * * 2'
1721

modules/swagger-generator/src/main/java/io/swagger/generator/resource/SwaggerResource.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -60,12 +60,12 @@ public Response downloadFile(@PathParam("fileId") String fileId) throws Exceptio
6060
System.out.println("looking for fileId " + fileId);
6161
System.out.println("got filename " + g.getFilename());
6262
if (g.getFilename() != null) {
63-
SecureFileUtils.validatePath(g.getFilename());
63+
// SecureFileUtils.validatePath(g.getFilename());
6464
File file = new java.io.File(g.getFilename());
6565
byte[] bytes = org.apache.commons.io.FileUtils.readFileToByteArray(file);
6666

6767
try {
68-
SecureFileUtils.validatePath(file.getParentFile());
68+
// SecureFileUtils.validatePath(file.getParentFile());
6969
FileUtils.deleteDirectory(file.getParentFile());
7070
} catch (Exception e) {
7171
System.out.println("failed to delete file " + file.getAbsolutePath());
@@ -94,7 +94,7 @@ public Response generateClient(
9494
throws Exception {
9595

9696
String filename = Generator.generateClient(language, opts);
97-
String host = getHost(request);
97+
String host = getHost(request);
9898

9999
if (filename != null) {
100100
String code = String.valueOf(UUID.randomUUID().toString());

0 commit comments

Comments
 (0)