Skip to content

Verify public-private tls key pair #1108

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

Merged
jfallows merged 5 commits into from
Jun 28, 2024
Merged

Verify public-private tls key pair #1108

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
b552a09
Verify public-private tls key pair
attilakreiner Jun 27, 2024
310fa87
fix mv keypair key
attilakreiner Jun 28, 2024
c2a8ed1
fix TlsBindingConfig init
attilakreiner Jun 28, 2024
5dba8c0
fix verifier
attilakreiner Jun 28, 2024
585156a
fix ref TlsKeyPairVerifier verify
attilakreiner Jun 28, 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
Prev Previous commit
Next Next commit
fix mv keypair key
  • Loading branch information
@attilakreiner
attilakreiner committed Jun 28, 2024
commit 310fa87473b7c68409da92d6de8d61ce2840e182
18 changes: 9 additions & 9 deletions ...ing-tls/src/main/java/io/aklivity/zilla/runtime/binding/tls/internal/TlsEventContext.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,12 @@

import static io.aklivity.zilla.runtime.binding.tls.internal.types.event.TlsEventType.TLS_FAILED;
import static io.aklivity.zilla.runtime.binding.tls.internal.types.event.TlsEventType.TLS_HANDSHAKE_FAILED;
import static io.aklivity.zilla.runtime.binding.tls.internal.types.event.TlsEventType.TLS_KEY_PAIR_VERIFICATION_FAILED;
import static io.aklivity.zilla.runtime.binding.tls.internal.types.event.TlsEventType.TLS_KEY_REJECTED;
import static io.aklivity.zilla.runtime.binding.tls.internal.types.event.TlsEventType.TLS_KEY_VERIFICATION_FAILED;
import static io.aklivity.zilla.runtime.binding.tls.internal.types.event.TlsEventType.TLS_PEER_NOT_VERIFIED;
import static io.aklivity.zilla.runtime.binding.tls.internal.types.event.TlsEventType.TLS_PROTOCOL_REJECTED;
import static io.aklivity.zilla.runtime.binding.tls.internal.types.event.TlsKeyPairFailureType.TLS_KEY_PAIR_INVALID;
import static io.aklivity.zilla.runtime.binding.tls.internal.types.event.TlsKeyPairFailureType.TLS_KEY_PAIR_MISSING;
import static io.aklivity.zilla.runtime.binding.tls.internal.types.event.TlsKeyFailureType.TLS_KEY_INVALID;
import static io.aklivity.zilla.runtime.binding.tls.internal.types.event.TlsKeyFailureType.TLS_KEY_MISSING;

import java.nio.ByteBuffer;
import java.time.Clock;
Expand All @@ -32,7 +32,7 @@

import io.aklivity.zilla.runtime.binding.tls.internal.types.event.EventFW;
import io.aklivity.zilla.runtime.binding.tls.internal.types.event.TlsEventExFW;
import io.aklivity.zilla.runtime.binding.tls.internal.types.event.TlsKeyPairFailureType;
import io.aklivity.zilla.runtime.binding.tls.internal.types.event.TlsKeyFailureType;
import io.aklivity.zilla.runtime.engine.EngineContext;
import io.aklivity.zilla.runtime.engine.binding.function.MessageConsumer;

Expand Down Expand Up @@ -177,25 +177,25 @@ public void tlsKeyPairMissing(
long bindingId,
String keyName)
{
tlsKeyPairVerificationFailed(TLS_KEY_PAIR_MISSING, bindingId, keyName);
tlsKeyPairVerificationFailed(TLS_KEY_MISSING, bindingId, keyName);
}

public void tlsKeyPairInvalid(
long bindingId,
String keyName)
{
tlsKeyPairVerificationFailed(TLS_KEY_PAIR_INVALID, bindingId, keyName);
tlsKeyPairVerificationFailed(TLS_KEY_INVALID, bindingId, keyName);
}

private void tlsKeyPairVerificationFailed(
TlsKeyPairFailureType failureType,
TlsKeyFailureType failureType,
long bindingId,
String keyName)
{
TlsEventExFW extension = tlsEventExRW
.wrap(extensionBuffer, 0, extensionBuffer.capacity())
.tlsKeyPairVerificationFailed(e -> e
.typeId(TLS_KEY_PAIR_VERIFICATION_FAILED.value())
.tlsKeyVerificationFailed(e -> e
.typeId(TLS_KEY_VERIFICATION_FAILED.value())
.failureType(t -> t.set(failureType))
.keyName(keyName)
)
Expand Down
10 changes: 5 additions & 5 deletions ...g-tls/src/main/java/io/aklivity/zilla/runtime/binding/tls/internal/TlsEventFormatter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@

import io.aklivity.zilla.runtime.binding.tls.internal.types.event.EventFW;
import io.aklivity.zilla.runtime.binding.tls.internal.types.event.TlsEventExFW;
import io.aklivity.zilla.runtime.binding.tls.internal.types.event.TlsKeyPairVerificationFailedExFW;
import io.aklivity.zilla.runtime.binding.tls.internal.types.event.TlsKeyVerificationFailedExFW;
import io.aklivity.zilla.runtime.engine.Configuration;
import io.aklivity.zilla.runtime.engine.event.EventFormatterSpi;

Expand Down Expand Up @@ -69,13 +69,13 @@ public String format(
result = "The client and server could not negotiate the desired level of security.";
break;
}
case TLS_KEY_PAIR_VERIFICATION_FAILED:
case TLS_KEY_VERIFICATION_FAILED:
{
TlsKeyPairVerificationFailedExFW ex = extension.tlsKeyPairVerificationFailed();
TlsKeyVerificationFailedExFW ex = extension.tlsKeyVerificationFailed();
result = switch (ex.failureType().get())
{
case TLS_KEY_PAIR_MISSING -> String.format("Key pair (%s) is missing.", ex.keyName());
case TLS_KEY_PAIR_INVALID -> String.format("Key pair (%s) is invalid.", ex.keyName());
case TLS_KEY_MISSING -> String.format("Key pair (%s) is missing.", ex.keyName());
case TLS_KEY_INVALID -> String.format("Key pair (%s) is invalid.", ex.keyName());
};
break;
}
Expand Down
14 changes: 7 additions & 7 deletions specs/binding-tls.spec/src/main/resources/META-INF/zilla/tls.idl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,18 +24,18 @@ scope tls
TLS_KEY_REJECTED (3),
TLS_PEER_NOT_VERIFIED (4),
TLS_HANDSHAKE_FAILED (5),
TLS_KEY_PAIR_VERIFICATION_FAILED (6)
TLS_KEY_VERIFICATION_FAILED (6)
}

enum TlsKeyPairFailureType (uint8)
enum TlsKeyFailureType (uint8)
{
TLS_KEY_PAIR_MISSING (1),
TLS_KEY_PAIR_INVALID (2)
TLS_KEY_MISSING (1),
TLS_KEY_INVALID (2)
}

struct TlsKeyPairVerificationFailedEx extends core::stream::Extension
struct TlsKeyVerificationFailedEx extends core::stream::Extension
{
TlsKeyPairFailureType failureType;
TlsKeyFailureType failureType;
string8 keyName;
}

Expand All @@ -46,7 +46,7 @@ scope tls
case TLS_KEY_REJECTED: core::stream::Extension tlsKeyRejected;
case TLS_PEER_NOT_VERIFIED: core::stream::Extension tlsPeerNotVerified;
case TLS_HANDSHAKE_FAILED: core::stream::Extension tlsHandshakeFailed;
case TLS_KEY_PAIR_VERIFICATION_FAILED: TlsKeyPairVerificationFailedEx tlsKeyPairVerificationFailed;
case TLS_KEY_VERIFICATION_FAILED: TlsKeyVerificationFailedEx tlsKeyVerificationFailed;
}
}
}