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

Fix stream has already been operated upon or closed #457

Merged
merged 8 commits into from
Feb 21, 2024
Merged

Fix stream has already been operated upon or closed #457

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
fde33aa
Fix stream has already been operated upon or closed
hamadodene Feb 14, 2024
4b6597f
Fix stream has already been operated upon or closed
hamadodene Feb 14, 2024
99a6f81
Merge branch 'fix/stream-illegalstateexception' of https://github.com…
hamadodene Feb 16, 2024
6893cbc
Added check number of segment of subdomain
hamadodene Feb 16, 2024
dd650f7
Fix listener close using channelGroup
hamadodene Feb 20, 2024
e3e6f0c
Merge branch 'master' into fix/stream-illegalstateexception
hamadodene Feb 20, 2024
8fe17b5
Merge branch 'diennea:master' into fix/stream-illegalstateexception
hamadodene Feb 21, 2024
54316ce
Set channel Group closure timeout to 10s
hamadodene Feb 21, 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
14 changes: 11 additions & 3 deletions ...ace-server/src/main/java/org/carapaceproxy/server/config/SSLCertificateConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,16 +93,24 @@ public boolean isMoreSpecific(SSLCertificateConfiguration other) {
if (subjectAltNames == null || subjectAltNames.isEmpty()) {
return hostname.length() > other.getHostname().length();
}
final var otherNames = other.getNames().stream().map(CertificatesUtils::removeWildcard);
for (var n: getNames()) {

final int maxOtherNameLength = other.getNames().stream()
.map(CertificatesUtils::removeWildcard)
.map(String::length)
.max(Integer::compareTo)
.orElse(0);

for (var n : getNames()) {
final var name = CertificatesUtils.removeWildcard(n);
if (otherNames.anyMatch(on -> name.length() > on.length())) {
if (name.length() > maxOtherNameLength) {
return true;
}
}
return false;
}



public Collection<String> getNames() {
return new ArrayList<>() {{
add(id); // hostname or *.hostname
Expand Down
7 changes: 7 additions & 0 deletions carapace-server/src/test/java/org/carapaceproxy/listeners/SSLSNITest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,10 +96,16 @@ public void testChooseCertificate() throws Exception {
server.addCertificate(new SSLCertificateConfiguration("other", null, "cert", "pwd", STATIC));
server.addCertificate(new SSLCertificateConfiguration("*.example.com", Set.of("example.com", "*.example2.com"), "cert", "pwd", STATIC));
server.addCertificate(new SSLCertificateConfiguration("www.example.com", null, "cert", "pwd", STATIC));
server.addCertificate(new SSLCertificateConfiguration("*.qapatchweb.peachtest.it", Set.of("qapatchweb.peachtest.it"), "cert", "pwd", STATIC));
server.addCertificate(new SSLCertificateConfiguration("*.qapatch2web.peachtest.it", Set.of("qapatch2web.peachtest.it"), "cert", "pwd", STATIC));
server.addCertificate(new SSLCertificateConfiguration("*.peachtest.it", Set.of("gemini.peachtest.it"), "cert", "pwd", STATIC));


// client requests bad SNI, bad default in listener
assertNull(server.getListeners().chooseCertificate("no", "no-default"));

assertEquals("*.qapatchweb.peachtest.it", server.getListeners().chooseCertificate("test.qapatchweb.peachtest.it", "no-default").getId());

// client requests SNI, bad default in listener
assertEquals("other", server.getListeners().chooseCertificate("other", "no-default").getId());

Expand Down Expand Up @@ -142,6 +148,7 @@ public void testChooseCertificate() throws Exception {
assertEquals("*", server.getListeners().chooseCertificate("", null).getId());
assertEquals("*", server.getListeners().chooseCertificate(null, "").getId());
}

}

@Test
Expand Down
Loading