Merge pull request #696 from eclipse-passage/572366-2

Bug 572366 verify product's public key on hc-fls interaction
eclipse-passage · Mar 30, 2021 · f55076b · f55076b
2 parents 528e754 + 2c69e83
commit f55076b
Show file tree

Hide file tree

Showing 9 changed files with 62 additions and 13 deletions.
diff --git a/...passage.lic.hc/src/org/eclipse/passage/lic/internal/hc/remote/impl/RequestParameters.java b/...passage.lic.hc/src/org/eclipse/passage/lic/internal/hc/remote/impl/RequestParameters.java
@@ -21,25 +21,28 @@
 import org.eclipse.passage.lic.floating.model.api.FloatingLicenseAccess;
 import org.eclipse.passage.lic.floating.model.net.ServerAuthenticationExpression;
 import org.eclipse.passage.lic.floating.model.net.ServerAuthenticationType;
-import org.eclipse.passage.lic.internal.api.PassageAction;
 import org.eclipse.passage.lic.internal.api.LicensedProduct;
 import org.eclipse.passage.lic.internal.api.LicensingException;
+import org.eclipse.passage.lic.internal.api.PassageAction;
 import org.eclipse.passage.lic.internal.base.NamedData;
 import org.eclipse.passage.lic.internal.base.ProductIdentifier;
 import org.eclipse.passage.lic.internal.base.ProductVersion;
 import org.eclipse.passage.lic.internal.hc.i18n.AccessMessages;
 import org.eclipse.passage.lic.internal.hc.remote.QueryParameters;
+import org.eclipse.passage.lic.internal.net.EncodingAlgorithm;
 import org.eclipse.passage.lic.internal.net.LicenseUser;
 import org.eclipse.passage.lic.internal.net.LicensingAction;
 
 public abstract class RequestParameters implements QueryParameters {
 
 	private final LicensedProduct product;
 	private final FloatingLicenseAccess access;
+	private final String hash;
 
-	protected RequestParameters(LicensedProduct product, FloatingLicenseAccess access) {
+	protected RequestParameters(LicensedProduct product, FloatingLicenseAccess access, String hash) {
 		this.product = product;
 		this.access = access;
+		this.hash = hash;
 	}
 
 	@Override
@@ -67,6 +70,8 @@ private List<NamedData> generalParameters() throws LicensingException {
 				new ProductVersion(encode(product.version())), //
 				new LicensingAction(action()), //
 				new LicenseUser(access.getUser()), //
+				new LicenseUser(access.getUser()), //
+				new EncodingAlgorithm(hash), //
 				new ServerAuthenticationType(access.getServer().getAuthentication().getType()), //
 				new ServerAuthenticationExpression(encode(access.getServer().getAuthentication().getExpression())));
 

diff --git a/...src/org/eclipse/passage/lic/internal/hc/remote/impl/acquire/AcquireRequestParameters.java b/...src/org/eclipse/passage/lic/internal/hc/remote/impl/acquire/AcquireRequestParameters.java
@@ -16,9 +16,9 @@
 import java.util.List;
 
 import org.eclipse.passage.lic.floating.model.api.FloatingLicenseAccess;
-import org.eclipse.passage.lic.internal.api.PassageAction;
 import org.eclipse.passage.lic.internal.api.LicensedProduct;
 import org.eclipse.passage.lic.internal.api.LicensingException;
+import org.eclipse.passage.lic.internal.api.PassageAction;
 import org.eclipse.passage.lic.internal.base.FeatureIdentifier;
 import org.eclipse.passage.lic.internal.base.NamedData;
 import org.eclipse.passage.lic.internal.hc.remote.impl.RequestParameters;
@@ -27,8 +27,8 @@ final class AcquireRequestParameters extends RequestParameters {
 
 	private final String feature;
 
-	AcquireRequestParameters(LicensedProduct product, String feature, FloatingLicenseAccess access) {
-		super(product, access);
+	AcquireRequestParameters(LicensedProduct product, String feature, FloatingLicenseAccess access, String hash) {
+		super(product, access, hash);
 		this.feature = feature;
 	}
 

diff --git a/...src/org/eclipse/passage/lic/internal/hc/remote/impl/acquire/ReleaseRequestParameters.java b/...src/org/eclipse/passage/lic/internal/hc/remote/impl/acquire/ReleaseRequestParameters.java
@@ -16,9 +16,9 @@
 import java.util.List;
 
 import org.eclipse.passage.lic.floating.model.api.FloatingLicenseAccess;
-import org.eclipse.passage.lic.internal.api.PassageAction;
 import org.eclipse.passage.lic.internal.api.LicensedProduct;
 import org.eclipse.passage.lic.internal.api.LicensingException;
+import org.eclipse.passage.lic.internal.api.PassageAction;
 import org.eclipse.passage.lic.internal.base.FeatureIdentifier;
 import org.eclipse.passage.lic.internal.base.NamedData;
 import org.eclipse.passage.lic.internal.hc.remote.impl.RequestParameters;
@@ -27,8 +27,8 @@ final class ReleaseRequestParameters extends RequestParameters {
 
 	private final String feature;
 
-	ReleaseRequestParameters(LicensedProduct product, String feature, FloatingLicenseAccess access) {
-		super(product, access);
+	ReleaseRequestParameters(LicensedProduct product, String feature, FloatingLicenseAccess access, String hash) {
+		super(product, access, hash);
 		this.feature = feature;
 	}
 

diff --git a/...age.lic.hc/src/org/eclipse/passage/lic/internal/hc/remote/impl/acquire/RemoteAcquire.java b/...age.lic.hc/src/org/eclipse/passage/lic/internal/hc/remote/impl/acquire/RemoteAcquire.java
@@ -82,7 +82,7 @@ private final class Request extends RemoteRequest<C> {
 
 		@Override
 		public RequestParameters parameters() {
-			return new AcquireRequestParameters(data.product(), data.feature(), access);
+			return new AcquireRequestParameters(data.product(), data.feature(), access, hash);
 		}
 
 		@Override

diff --git a/...age.lic.hc/src/org/eclipse/passage/lic/internal/hc/remote/impl/acquire/RemoteRelease.java b/...age.lic.hc/src/org/eclipse/passage/lic/internal/hc/remote/impl/acquire/RemoteRelease.java
@@ -78,7 +78,7 @@ public Configuration<C> config() throws LicensingException {
 
 		@Override
 		public RequestParameters parameters() {
-			return new ReleaseRequestParameters(product, data.payload().feature(), access);
+			return new ReleaseRequestParameters(product, data.payload().feature(), access, hash);
 		}
 
 		private byte[] payload() throws LicensingException {

diff --git a/...ic.hc/src/org/eclipse/passage/lic/internal/hc/remote/impl/mine/MineRequestParameters.java b/...ic.hc/src/org/eclipse/passage/lic/internal/hc/remote/impl/mine/MineRequestParameters.java
@@ -24,8 +24,8 @@
 
 final class MineRequestParameters extends RequestParameters {
 
-	MineRequestParameters(LicensedProduct product, FloatingLicenseAccess access) {
-		super(product, access);
+	MineRequestParameters(LicensedProduct product, FloatingLicenseAccess access, String hash) {
+		super(product, access, hash);
 	}
 
 	@Override

diff --git a/....hc/src/org/eclipse/passage/lic/internal/hc/remote/impl/mine/RemoteConditionsRequest.java b/....hc/src/org/eclipse/passage/lic/internal/hc/remote/impl/mine/RemoteConditionsRequest.java
@@ -29,7 +29,7 @@ public RemoteConditionsRequest(LicensedProduct product, FloatingLicenseAccess ac
 
 	@Override
 	public RequestParameters parameters() {
-		return new MineRequestParameters(product, access);
+		return new MineRequestParameters(product, access, hash);
 	}
 
 	@Override

diff --git a/...g.eclipse.passage.lic.net/src/org/eclipse/passage/lic/internal/net/EncodingAlgorithm.java b/...g.eclipse.passage.lic.net/src/org/eclipse/passage/lic/internal/net/EncodingAlgorithm.java
@@ -0,0 +1,34 @@
+/*******************************************************************************
+ * Copyright (c) 2020 ArSysOp
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * https://www.eclipse.org/legal/epl-2.0/.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ *     ArSysOp - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.passage.lic.internal.net;
+
+import java.util.function.Function;
+
+import org.eclipse.passage.lic.internal.base.StringNamedData;
+
+public final class EncodingAlgorithm extends StringNamedData {
+
+	public EncodingAlgorithm(String value) {
+		super(value);
+	}
+
+	public EncodingAlgorithm(Function<String, String> retrieve) {
+		super(retrieve);
+	}
+
+	@Override
+	public String key() {
+		return "algo"; //$NON-NLS-1$
+	}
+
+}
diff --git a/...e.passage.lic.net/src/org/eclipse/passage/lic/internal/net/handle/ProductUserRequest.java b/...e.passage.lic.net/src/org/eclipse/passage/lic/internal/net/handle/ProductUserRequest.java
@@ -19,6 +19,7 @@
 import org.eclipse.passage.lic.internal.base.BaseLicensedProduct;
 import org.eclipse.passage.lic.internal.base.ProductIdentifier;
 import org.eclipse.passage.lic.internal.base.ProductVersion;
+import org.eclipse.passage.lic.internal.net.EncodingAlgorithm;
 import org.eclipse.passage.lic.internal.net.LicenseUser;
 import org.eclipse.passage.lic.internal.net.api.handle.NetRequest;
 
@@ -27,11 +28,13 @@ public final class ProductUserRequest<R extends NetRequest> {
 	private final R raw;
 	private final Optional<LicensedProduct> product;
 	private final Optional<String> user;
+	private final Optional<String> algorithm;
 
 	public ProductUserRequest(R raw) throws LicensingException {
 		this.raw = raw;
 		this.product = extractProduct();
 		this.user = extractUser();
+		this.algorithm = extractAlgorithm();
 	}
 
 	private Optional<LicensedProduct> extractProduct() throws LicensingException {
@@ -49,6 +52,10 @@ private Optional<String> extractUser() {
 		return new LicenseUser(raw::parameter).get();
 	}
 
+	private Optional<String> extractAlgorithm() {
+		return new EncodingAlgorithm(raw::parameter).get();
+	}
+
 	public R raw() {
 		return raw;
 	}
@@ -61,4 +68,7 @@ public Optional<String> user() {
 		return user;
 	}
 
+	public Optional<String> algorithm() {
+		return algorithm;
+	}
 }