Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2026-01-17 04:52:10 +01:00
Code Issues Packages Projects Releases Activity

Check log permission before returning stream

Browse Source
This commit is contained in:
René Pfeuffer
2021-02-25 11:39:38 +01:00
parent 97c2165a52
commit e2cd0a8eeb
3 changed files with 16 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
scm-webapp/src/main/java/sonia/scm/api/v2/resources/RepositoryImportResource.java
View File

@@ -261,7 +261,8 @@ public class RepositoryImportResource {
@GET
@Path("log/{logId}")
@Produces(MediaType.TEXT_PLAIN)
public StreamingOutput getImportLog(@PathParam("logId") String logId) {
public StreamingOutput getImportLog(@PathParam("logId") String logId) throws IOException {
importLoggerFactory.checkCanReadLog(logId);
return out -> importLoggerFactory.getLog(logId, out);
}

14
scm-webapp/src/main/java/sonia/scm/importexport/RepositoryImportLoggerFactory.java
View File

@@ -53,13 +53,25 @@ public class RepositoryImportLoggerFactory {
return new RepositoryImportLogger(blobStoreFactory.withName("imports").build());
}
public void checkCanReadLog(String logId) throws IOException {
try (InputStream blob = getBlob(logId)) {
// nothing to read
}
}
public void getLog(String logId, OutputStream out) throws IOException {
try (InputStream log = getBlob(logId)) {
IOUtil.copy(log, out);
}
}
private InputStream getBlob(String logId) throws IOException {
BlobStore importStore = blobStoreFactory.withName("imports").build();
InputStream log = importStore
.getOptional(logId).orElseThrow(() -> new NotFoundException("Log", logId))
.getInputStream();
checkPermission(log);
IOUtil.copy(log, out);
return log;
}
private void checkPermission(InputStream log) throws IOException {

1
scm-webapp/src/test/java/sonia/scm/api/v2/resources/RepositoryImportResourceTest.java
View File

@@ -289,6 +289,7 @@ public class RepositoryImportResourceTest extends RepositoryTestBase {
assertThat(response.getStatus()).isEqualTo(SC_OK);
assertThat(response.getContentAsString()).isEqualTo("some log");
verify(importLoggerFactory).checkCanReadLog("42");
}
private boolean streamHasContent(InputStream argument, String expectedContent) {