m-chrzan.xyz
aboutsummaryrefslogtreecommitdiff
path: root/src/main
diff options
context:
space:
mode:
authorMagdalena GrodziƄska <mag.grodzinska@gmail.com>2020-01-14 23:55:05 +0100
committerGitHub <noreply@github.com>2020-01-14 23:55:05 +0100
commit1986aaadaf6dd4316dce0186616a515e6721628c (patch)
treedf8981a8cfc019f651245b4bca30479fd92cebaa /src/main
parent7972afc9cab164615116f494e6824b88f8f873a7 (diff)
parentbecf7ebe358740ca082d4147ab3e1a3c99106e57 (diff)
Merge pull request #121 from m-chrzan/last_fixes
Last fixes
Diffstat (limited to 'src/main')
-rw-r--r--src/main/java/pl/edu/mimuw/cloudatlas/agent/modules/Stanik.java24
1 files changed, 13 insertions, 11 deletions
diff --git a/src/main/java/pl/edu/mimuw/cloudatlas/agent/modules/Stanik.java b/src/main/java/pl/edu/mimuw/cloudatlas/agent/modules/Stanik.java
index efc5605..382160e 100644
--- a/src/main/java/pl/edu/mimuw/cloudatlas/agent/modules/Stanik.java
+++ b/src/main/java/pl/edu/mimuw/cloudatlas/agent/modules/Stanik.java
@@ -226,23 +226,25 @@ public class Stanik extends Module {
for (Entry<Attribute, ValueQuery> entry : message.getQueries().entrySet()) {
Attribute attribute = entry.getKey();
ValueQuery query = entry.getValue();
- try {
- if (query.isInstalled()) {
+ if (query.getSignature() != null) {
+ try {
+ if (query.isInstalled()) {
QuerySignerApiImplementation.validateInstallQuery(
attribute.getName(),
QueryUtils.constructQueryData(query),
this.publicKey);
- } else {
- QuerySignerApiImplementation.validateUninstallQuery(
- attribute.getName(),
- QueryUtils.constructQueryData(query),
- this.publicKey);
+ } else {
+ QuerySignerApiImplementation.validateUninstallQuery(
+ attribute.getName(),
+ QueryUtils.constructQueryData(query),
+ this.publicKey);
+ }
+ } catch (RemoteException | IllegalBlockSizeException | InvalidKeyException | BadPaddingException | NoSuchAlgorithmException | NoSuchPaddingException | QuerySigner.InvalidQueryException e) {
+ System.out.println("ERROR: Query " + attribute.getName() + " was not updated in Stanik with error message " + e.getMessage());
+ e.printStackTrace();
+ continue;
}
- } catch (RemoteException | IllegalBlockSizeException | InvalidKeyException | BadPaddingException | NoSuchAlgorithmException | NoSuchPaddingException | QuerySigner.InvalidQueryException e) {
- System.out.println("ERROR: Query " + attribute.getName() + " was not updated in Stanik with error message " + e.getMessage());
- e.printStackTrace();
- continue;
}
ValueTime timestamp = new ValueTime(entry.getValue().getTimestamp());
ValueQuery currentTimestampedQuery = queries.get(attribute);