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

Ssl context refactoring #1400

Merged
merged 7 commits into from
Dec 19, 2024
Merged

Ssl context refactoring #1400

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
d2eb81e
Fixed tests
predic8 Dec 9, 2024
6a6c5a5
Merge remote-tracking branch 'origin/master'
predic8 Dec 10, 2024
634891c
Refactoring
predic8 Dec 10, 2024
329ab74
Refactoring
predic8 Dec 10, 2024
990093a
Merge branch 'master' into ssl-context-refactoring
predic8 Dec 12, 2024
bcdaf70
Merge branch 'master' into ssl-context-refactoring
predic8 Dec 16, 2024
7a6c651
Merge branch 'master' into ssl-context-refactoring
predic8 Dec 19, 2024
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
23 changes: 15 additions & 8 deletions core/src/main/java/com/predic8/membrane/core/config/security/Trust.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,17 +14,12 @@

package com.predic8.membrane.core.config.security;

import com.predic8.membrane.annot.MCAttribute;
import com.predic8.membrane.annot.MCChildElement;
import com.predic8.membrane.annot.MCElement;
import com.predic8.membrane.annot.*;

import java.util.ArrayList;
import java.util.List;
import java.util.Objects;
import java.util.*;

/**
* @description Experimental.
* <p>Allows to insert one or more PEM blocks containing the certificates to be trusted directly into the proxies.xml
* @description <p>Allows to insert one or more PEM blocks containing the certificates to be trusted directly into the proxies.xml
* file.</p>
* <p>This is an alternative for {@link TrustStore}.</p>
*/
Expand Down Expand Up @@ -53,6 +48,10 @@ public List<Certificate> getCertificateList() {
return certificateList;
}

/**
* @description List of certificates
* @param certificateList
*/
@MCChildElement
public void setCertificateList(List<Certificate> certificateList) {
this.certificateList = certificateList;
Expand All @@ -62,6 +61,10 @@ public String getAlgorithm() {
return algorithm;
}

/**
*
* @param algorithm
*/
@MCAttribute
public void setAlgorithm(String algorithm) {
this.algorithm = algorithm;
Expand All @@ -71,6 +74,10 @@ public String getCheckRevocation() {
return checkRevocation;
}

/**
* TODO
* @param checkRevocation
*/
@MCAttribute
public void setCheckRevocation(String checkRevocation) {
this.checkRevocation = checkRevocation;
Expand Down
7 changes: 5 additions & 2 deletions core/src/main/java/com/predic8/membrane/core/config/security/TrustStore.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,8 @@ public class TrustStore extends Store {

@Override
public boolean equals(Object obj) {
if (!(obj instanceof TrustStore))
if (!(obj instanceof TrustStore other))
return false;
TrustStore other = (TrustStore) obj;
return super.equals(obj)
&& Objects.equal(algorithm, other.algorithm);
}
Expand All @@ -50,6 +49,10 @@ public String getCheckRevocation() {
return checkRevocation;
}

/**
* TODO
* @param checkRevocation
*/
@MCAttribute
public void setCheckRevocation(String checkRevocation) {
this.checkRevocation = checkRevocation;
Expand Down
Loading
Loading