loafle/openapi-generator
3
0
Fork 0
forked from loafle/openapi-generator-original
Code Pull Requests Activity

Merge pull request #1876 from xhh/file-downloading-fixes

Browse Source 
File downloading improvements for Ruby and Java
This commit is contained in:
wing328
2016-01-15 11:25:25 +08:00
parent 0c4cc10095 521ba9924b
commit 078f68a211
7 changed files with 112 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/ApiClient.java
View File

@@ -580,6 +580,17 @@ public class ApiClient {
return params;
}
/**
* Sanitize filename by removing path.
* e.g. ../../sun.gif becomes sun.gif
*
* @param filename The filename to be sanitized
* @return The sanitized filename
*/
public String sanitizeFilename(String filename) {
return filename.replaceAll(".*[/\\\\]", "");
}
/**
* Check if the given MIME is a JSON MIME.
* JSON MIME examples:
@@ -737,8 +748,9 @@ public class ApiClient {
// Get filename from the Content-Disposition header.
Pattern pattern = Pattern.compile("filename=['\"]?([^'\"\\s]+)['\"]?");
Matcher matcher = pattern.matcher(contentDisposition);
if (matcher.find())
filename = matcher.group(1);
if (matcher.find()) {
filename = sanitizeFilename(matcher.group(1));
}
}
String prefix = null;

13
samples/client/petstore/java/okhttp-gson/src/test/java/io/swagger/client/ApiClientTest.java
View File

@@ -277,4 +277,17 @@ public class ApiClientTest {
assertEquals(values.size(), pairValueSplit.length);
}
}
@Test
public void testSanitizeFilename() {
assertEquals("sun", apiClient.sanitizeFilename("sun"));
assertEquals("sun.gif", apiClient.sanitizeFilename("sun.gif"));
assertEquals("sun.gif", apiClient.sanitizeFilename("../sun.gif"));
assertEquals("sun.gif", apiClient.sanitizeFilename("/var/tmp/sun.gif"));
assertEquals("sun.gif", apiClient.sanitizeFilename("./sun.gif"));
assertEquals("sun.gif", apiClient.sanitizeFilename("..\\sun.gif"));
assertEquals("sun.gif", apiClient.sanitizeFilename("\\var\\tmp\\sun.gif"));
assertEquals("sun.gif", apiClient.sanitizeFilename("c:\\var\\tmp\\sun.gif"));
assertEquals("sun.gif", apiClient.sanitizeFilename(".\\sun.gif"));
}
}