lingwei.kong/hawkbit
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

fix the lookup of artifacts with the same lookup key, e.g. SHA1 hash if

Browse Source 
multiple artifacts with key exists for different software modules

Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
This commit is contained in:
Michael Hirsch
2016-04-12 09:39:07 +02:00
parent 85ec59b04e
commit c4fd082098
3 changed files with 97 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
hawkbit-dmf-amqp/src/main/java/org/eclipse/hawkbit/amqp/AmqpMessageHandlerService.java
View File

@@ -166,6 +166,8 @@ public class AmqpMessageHandlerService extends BaseAmqpService {
final LocalArtifact localArtifact = findLocalArtifactByFileResource(fileResource);
if (localArtifact == null) {
LOG.info("target {} requested file resource which does not exists to download",
secruityToken.getControllerId(), fileResource);
throw new EntityNotFoundException();
}
@@ -175,10 +177,14 @@ public class AmqpMessageHandlerService extends BaseAmqpService {
// assigned to this controller. Otherwise no controllerId is set =
// anonymous download
if (secruityToken.getControllerId() != null) {
final Action action = controllerManagement.getActionForDownloadByTargetAndSoftwareModule(
secruityToken.getControllerId(), localArtifact.getSoftwareModule());
LOG.info("Found action for download authentication request action: {}, resource: {}", action,
secruityToken.getFileResource());
LOG.debug("no anonymous download request, doing authentication check for target {} and artifact {}",
secruityToken.getControllerId(), localArtifact);
if (!controllerManagement.hasTargetArtifactAssigned(secruityToken.getControllerId(), localArtifact)) {
LOG.info("target {} tried to download artifact {} which is not assigned to the target");
throw new EntityNotFoundException();
}
LOG.info("download security check for target {} and artifact {} granted",
secruityToken.getControllerId(), localArtifact);
}
final Artifact artifact = convertDbArtifact(artifactManagement.loadLocalArtifactBinary(localArtifact));