Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bug 572366 verify product's public key on hc-fls interaction #700

Merged
merged 2 commits into from
Mar 31, 2021
Merged

Bug 572366 verify product's public key on hc-fls interaction #700

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
af56fb0
Bug 572366 verify product's public key on hc-fls interaction
eparovyshnaya Mar 31, 2021
3d2a876
Bug 572366 verify product's public key on hc-fls interaction
eparovyshnaya Mar 31, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions ....lbc.base/src/org/eclipse/passage/lbc/internal/base/ServerAuthenticationInstructions.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@
import java.util.Optional;
import java.util.function.Supplier;

import org.eclipse.passage.lic.floating.model.net.ServerAuthenticationExpression;
import org.eclipse.passage.lic.floating.model.net.ServerAuthenticationType;
import org.eclipse.passage.lic.floating.internal.model.net.ServerAuthenticationExpression;
import org.eclipse.passage.lic.floating.internal.model.net.ServerAuthenticationType;
import org.eclipse.passage.lic.internal.api.EvaluationInstructions;
import org.eclipse.passage.lic.internal.api.EvaluationType;
import org.eclipse.passage.lic.internal.base.conditions.BaseEvaluationInstructions;
Expand Down
1 change: 1 addition & 0 deletions ...g.eclipse.passage.lic.base/src/org/eclipse/passage/lic/internal/base/logging/Logging.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ public Logging(ConfigSupplier config) {
@SuppressWarnings("resource")
public void configure() {
try {
System.setProperty("org.apache.logging.log4j.simplelog.StatusLogger.level", "ERROR"); //$NON-NLS-1$//$NON-NLS-2$
ConfigurationSource source = new ConfigurationSource(new FileInputStream(config.get().toFile()));
Configurator.initialize(getClass().getClassLoader().getParent(), source);
} catch (Exception e) {
Expand Down
8 changes: 4 additions & 4 deletions bundles/org.eclipse.passage.lic.floating.model/META-INF/MANIFEST.MF
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Manifest-Version: 1.0
Automatic-Module-Name: org.eclipse.passage.lic.floating.model
Bundle-ManifestVersion: 2
Bundle-SymbolicName: org.eclipse.passage.lic.floating.model;singleton:=true
Bundle-Version: 0.1.100.qualifier
Bundle-Version: 0.1.101.qualifier
Bundle-Name: %pluginName
Bundle-Vendor: %providerName
Bundle-Copyright: %Bundle-Copyright
Expand All @@ -14,7 +14,9 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="0.0.0";resolution:=opti
org.eclipse.passage.lic.floating;bundle-version="0.0.0";visibility:=reexport,
org.eclipse.passage.lic.api;bundle-version="1.0.100",
org.eclipse.passage.lic.base;bundle-version="1.0.100"
Export-Package: org.eclipse.passage.lic.floating.model.api;
Export-Package: org.eclipse.passage.lic.floating.internal.model.convert;x-friends:="org.eclipse.passage.lic.hc",
org.eclipse.passage.lic.floating.internal.model.net;x-friends:="org.eclipse.passage.lbc.base,org.eclipse.passage.lic.hc",
org.eclipse.passage.lic.floating.model.api;
x-friends:="org.eclipse.passage.lic.floating.edit,
org.eclipse.passage.loc.dashboard.ui,
org.eclipse.passage.loc.api,
Expand All @@ -24,7 +26,6 @@ Export-Package: org.eclipse.passage.lic.floating.model.api;
org.eclipse.passage.lbc.base,
org.eclipse.passage.lbc.api,
org.eclipse.passage.lbc.base.tests",
org.eclipse.passage.lic.floating.model.convert;x-friends:="org.eclipse.passage.lic.hc",
org.eclipse.passage.lic.floating.model.impl;x-internal:=true,
org.eclipse.passage.lic.floating.model.meta;
x-friends:="org.eclipse.passage.lic.floating.e4.ui,
Expand All @@ -35,7 +36,6 @@ Export-Package: org.eclipse.passage.lic.floating.model.api;
org.eclipse.passage.lbc.base,
org.eclipse.passage.lbc.base.tests,
org.eclipse.passage.lic.hc",
org.eclipse.passage.lic.floating.model.net,
org.eclipse.passage.lic.floating.model.util;x-friends:="org.eclipse.passage.lic.floating.edit"
Bundle-ClassPath: .
Bundle-ActivationPolicy: lazy
4 changes: 2 additions & 2 deletions ...ting/model/convert/EGrantAcquisition.java → ...rnal/model/convert/EGrantAcquisition.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*******************************************************************************
* Copyright (c) 2020 ArSysOp
* Copyright (c) 2020, 2021 ArSysOp
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License 2.0 which is available at
Expand All @@ -10,7 +10,7 @@
* Contributors:
* ArSysOp - initial API and implementation
*******************************************************************************/
package org.eclipse.passage.lic.floating.model.convert;
package org.eclipse.passage.lic.floating.internal.model.convert;

import java.util.function.Supplier;

Expand Down
7 changes: 4 additions & 3 deletions ...ting/model/convert/PGrantAcquisition.java → ...rnal/model/convert/PGrantAcquisition.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*******************************************************************************
* Copyright (c) 2020 ArSysOp
* Copyright (c) 2020, 2021 ArSysOp
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License 2.0 which is available at
Expand All @@ -10,15 +10,16 @@
* Contributors:
* ArSysOp - initial API and implementation
*******************************************************************************/
package org.eclipse.passage.lic.floating.model.convert;
package org.eclipse.passage.lic.floating.internal.model.convert;

import java.util.Objects;
import java.util.function.Supplier;

import org.eclipse.passage.lic.floating.model.api.GrantAcqisition;
import org.eclipse.passage.lic.internal.base.acquire.BaseGrantAcquisition;

public final class PGrantAcquisition implements Supplier<org.eclipse.passage.lic.internal.api.acquire.GrantAcquisition> {
public final class PGrantAcquisition
implements Supplier<org.eclipse.passage.lic.internal.api.acquire.GrantAcquisition> {

private final GrantAcqisition source;

Expand Down
4 changes: 2 additions & 2 deletions ...l/net/ServerAuthenticationExpression.java → ...l/net/ServerAuthenticationExpression.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*******************************************************************************
* Copyright (c) 2020 ArSysOp
* Copyright (c) 2020, 2021 ArSysOp
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License 2.0 which is available at
Expand All @@ -10,7 +10,7 @@
* Contributors:
* ArSysOp - initial API and implementation
*******************************************************************************/
package org.eclipse.passage.lic.floating.model.net;
package org.eclipse.passage.lic.floating.internal.model.net;

import java.util.function.Function;

Expand Down
4 changes: 2 additions & 2 deletions ...g/model/net/ServerAuthenticationType.java → ...l/model/net/ServerAuthenticationType.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*******************************************************************************
* Copyright (c) 2020 ArSysOp
* Copyright (c) 2020, 2021 ArSysOp
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License 2.0 which is available at
Expand All @@ -10,7 +10,7 @@
* Contributors:
* ArSysOp - initial API and implementation
*******************************************************************************/
package org.eclipse.passage.lic.floating.model.net;
package org.eclipse.passage.lic.floating.internal.model.net;

import java.util.function.Function;

Expand Down
4 changes: 2 additions & 2 deletions ...passage.lic.hc/src/org/eclipse/passage/lic/internal/hc/remote/impl/RequestParameters.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@
import java.util.List;
import java.util.stream.Collectors;

import org.eclipse.passage.lic.floating.internal.model.net.ServerAuthenticationExpression;
import org.eclipse.passage.lic.floating.internal.model.net.ServerAuthenticationType;
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.LicensedProduct;
import org.eclipse.passage.lic.internal.api.LicensingException;
import org.eclipse.passage.lic.internal.api.PassageAction;
Expand Down
2 changes: 1 addition & 1 deletion ...age.lic.hc/src/org/eclipse/passage/lic/internal/hc/remote/impl/acquire/RemoteAcquire.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@
import java.nio.file.Path;
import java.util.function.Supplier;

import org.eclipse.passage.lic.floating.internal.model.convert.PGrantAcquisition;
import org.eclipse.passage.lic.floating.model.api.FloatingLicenseAccess;
import org.eclipse.passage.lic.floating.model.convert.PGrantAcquisition;
import org.eclipse.passage.lic.internal.api.LicensingException;
import org.eclipse.passage.lic.internal.api.acquire.GrantAcquisition;
import org.eclipse.passage.lic.internal.api.io.HashesRegistry;
Expand Down
2 changes: 1 addition & 1 deletion ...age.lic.hc/src/org/eclipse/passage/lic/internal/hc/remote/impl/acquire/RemoteRelease.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@
import java.nio.file.Path;
import java.util.function.Supplier;

import org.eclipse.passage.lic.floating.internal.model.convert.EGrantAcquisition;
import org.eclipse.passage.lic.floating.model.api.FloatingLicenseAccess;
import org.eclipse.passage.lic.floating.model.convert.EGrantAcquisition;
import org.eclipse.passage.lic.internal.api.LicensingException;
import org.eclipse.passage.lic.internal.api.acquire.GrantAcquisition;
import org.eclipse.passage.lic.internal.api.io.HashesRegistry;
Expand Down
5 changes: 3 additions & 2 deletions ...s/org.eclipse.passage.lbc.base.tests/src/org/eclipse/passage/lbc/base/tests/MineTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@
import java.util.Arrays;

import org.eclipse.passage.lbc.internal.base.FlotingRequestHandled;
import org.eclipse.passage.lic.floating.model.net.ServerAuthenticationExpression;
import org.eclipse.passage.lic.floating.model.net.ServerAuthenticationType;
import org.eclipse.passage.lic.floating.internal.model.net.ServerAuthenticationExpression;
import org.eclipse.passage.lic.floating.internal.model.net.ServerAuthenticationType;
import org.eclipse.passage.lic.internal.api.EvaluationType;
import org.eclipse.passage.lic.internal.api.PassageAction;
import org.eclipse.passage.lic.internal.base.ProductIdentifier;
Expand All @@ -29,6 +29,7 @@
import org.eclipse.passage.lic.internal.net.handle.Failure;
import org.junit.Test;

@SuppressWarnings("restriction")
public final class MineTest {

@Test
Expand Down
4 changes: 2 additions & 2 deletions ...pse.passage.lbc.base.tests/src/org/eclipse/passage/lbc/base/tests/RequestConstructed.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@
import org.eclipse.passage.lbc.internal.base.EagerFloatingState;
import org.eclipse.passage.lbc.internal.base.api.FloatingState;
import org.eclipse.passage.lbc.internal.base.api.RawRequest;
import org.eclipse.passage.lic.floating.model.net.ServerAuthenticationExpression;
import org.eclipse.passage.lic.floating.model.net.ServerAuthenticationType;
import org.eclipse.passage.lic.floating.internal.model.net.ServerAuthenticationExpression;
import org.eclipse.passage.lic.floating.internal.model.net.ServerAuthenticationType;
import org.eclipse.passage.lic.internal.api.EvaluationType;
import org.eclipse.passage.lic.internal.api.PassageAction;
import org.eclipse.passage.lic.internal.base.NamedData;
Expand Down
5 changes: 3 additions & 2 deletions ...ssage.lbc.base.tests/src/org/eclipse/passage/lbc/base/tests/ServerAuthenticationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,15 +16,16 @@
import static org.junit.Assert.assertTrue;

import org.eclipse.passage.lbc.internal.base.FlotingRequestHandled;
import org.eclipse.passage.lic.floating.model.net.ServerAuthenticationExpression;
import org.eclipse.passage.lic.floating.model.net.ServerAuthenticationType;
import org.eclipse.passage.lic.floating.internal.model.net.ServerAuthenticationExpression;
import org.eclipse.passage.lic.floating.internal.model.net.ServerAuthenticationType;
import org.eclipse.passage.lic.internal.api.EvaluationType;
import org.eclipse.passage.lic.internal.api.PassageAction;
import org.eclipse.passage.lic.internal.base.StringNamedData;
import org.eclipse.passage.lic.internal.net.api.handle.NetResponse;
import org.eclipse.passage.lic.internal.net.handle.Failure;
import org.junit.Test;

@SuppressWarnings("restriction")
public final class ServerAuthenticationTest {

@Test
Expand Down
4 changes: 2 additions & 2 deletions ...c.hc.tests/src/org/eclipse/passage/lic/internal/hc/tests/RemoteConditionsRequestTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,12 @@
import java.io.IOException;
import java.net.URL;

import org.eclipse.passage.lic.floating.internal.model.net.ServerAuthenticationExpression;
import org.eclipse.passage.lic.floating.internal.model.net.ServerAuthenticationType;
import org.eclipse.passage.lic.floating.model.api.EvaluationInstructions;
import org.eclipse.passage.lic.floating.model.api.FloatingLicenseAccess;
import org.eclipse.passage.lic.floating.model.api.FloatingServerConnection;
import org.eclipse.passage.lic.floating.model.meta.FloatingFactory;
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.LicensedProduct;
import org.eclipse.passage.lic.internal.api.LicensingException;
import org.eclipse.passage.lic.internal.api.PassageAction;
Expand Down