Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2025-11-01 19:15:52 +01:00
Code Issues Packages Projects Releases Activity

Cleanup code

Browse Source
This commit is contained in:
Rene Pfeuffer
2020-01-23 17:05:55 +01:00
parent c80ee02d8a
commit c0fd9b97b4
1 changed files with 15 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
scm-webapp/src/main/java/sonia/scm/plugin/PluginInstaller.java
View File

@@ -36,17 +36,7 @@ class PluginInstaller {
Files.copy(input, file); Files.copy(input, file);
verifyChecksum(plugin, input.hash(), file); verifyChecksum(plugin, input.hash(), file);
InstalledPluginDescriptor pluginDescriptor = smpDDescriptorExtractor.extractPluginDescriptor(file); verifyConditions(plugin, file);
if (!pluginDescriptor.getCondition().isSupported()) {
cleanup(file);
throw new PluginConditionFailedException(
pluginDescriptor.getCondition(),
String.format(
"could not load plugin %s, the plugin condition does not match",
plugin.getDescriptor().getInformation().getName()
)
);
}
return new PendingPluginInstallation(plugin.install(), file); return new PendingPluginInstallation(plugin.install(), file);
} catch (IOException ex) { } catch (IOException ex) {
cleanup(file); cleanup(file);
@@ -77,6 +67,20 @@ class PluginInstaller {
} }
} }
private void verifyConditions(AvailablePlugin plugin, Path file) throws IOException {
InstalledPluginDescriptor pluginDescriptor = smpDDescriptorExtractor.extractPluginDescriptor(file);
if (!pluginDescriptor.getCondition().isSupported()) {
cleanup(file);
throw new PluginConditionFailedException(
pluginDescriptor.getCondition(),
String.format(
"could not load plugin %s, the plugin condition does not match",
plugin.getDescriptor().getInformation().getName()
)
);
}
}
private InputStream download(AvailablePlugin plugin) throws IOException { private InputStream download(AvailablePlugin plugin) throws IOException {
return client.get(plugin.getDescriptor().getUrl()).request().contentAsStream(); return client.get(plugin.getDescriptor().getUrl()).request().contentAsStream();
} }