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

Allow checking signatures in dev mode #659

Draft
wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

Allow checking signatures in dev mode #659

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 2 additions & 0 deletions deployment/src/test/java/io/quarkiverse/githubapp/deployment/OptionalConfigFileTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package io.quarkiverse.githubapp.deployment;

import java.util.Optional;
import java.util.UUID;

import org.jboss.shrinkwrap.api.ShrinkWrap;
import org.jboss.shrinkwrap.api.spec.JavaArchive;
Expand Down Expand Up @@ -30,6 +31,7 @@ public void testOptionalConfigFile() {
RestAssured
.given()
.header(Headers.X_GITHUB_EVENT, "label")
.header(Headers.X_GITHUB_DELIVERY, UUID.randomUUID())
.contentType("application/json")
.body(Thread.currentThread().getContextClassLoader().getResourceAsStream(PAYLOAD))
.when().post("/")
Expand Down
29 changes: 24 additions & 5 deletions runtime/src/main/java/io/quarkiverse/githubapp/runtime/Routes.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,21 +92,39 @@ private void handleRequest(RoutingContext routingContext,
String hubSignature,
String deliveryId,
String event,
String replayed) {
String replayedHeader) {

if (!launchMode.isDevOrTest() && (isBlank(deliveryId) || isBlank(hubSignature))) {
boolean replayed = "true".equals(replayedHeader) && LaunchMode.current().isDevOrTest();
boolean checkSignatures = !replayed && LaunchMode.current() != LaunchMode.TEST;

if (isBlank(deliveryId)) {
routingExchange.response().setStatusCode(400).end();
LOG.debug("Request received without delivery id. It has been ignored.");
return;
}

if (checkSignatures && isBlank(hubSignature)) {
routingExchange.response().setStatusCode(400).end();

if (LaunchMode.current() == LaunchMode.DEVELOPMENT) {
LOG.warn(
"Request received without signature. This is only permitted for replayed events. It has been ignored.");
}

return;
}

if (routingContext.body().buffer() == null) {
routingExchange.ok().end();
LOG.debug("Request received without a body. It has been ignored.");
return;
}

byte[] bodyBytes = routingContext.body().buffer().getBytes();

if (checkedConfigProvider.webhookSecret().isPresent() && !launchMode.isDevOrTest()) {
if (checkSignatures && checkedConfigProvider.webhookSecret().isPresent()) {
System.out.println("Signature checked!");

if (!payloadSignatureChecker.matches(bodyBytes, hubSignature)) {
StringBuilder signatureError = new StringBuilder("Invalid signature for delivery: ").append(deliveryId)
.append("\n");
Expand All @@ -120,6 +138,7 @@ private void handleRequest(RoutingContext routingContext,

if (bodyBytes.length == 0) {
routingExchange.ok().end();
LOG.debug("Request received without a body. It has been ignored.");
return;
}

Expand All @@ -128,7 +147,7 @@ private void handleRequest(RoutingContext routingContext,

String action = payloadObject.getString("action");

if (!isBlank(deliveryId) && checkedConfigProvider.debug().payloadDirectory().isPresent()) {
if (checkedConfigProvider.debug().payloadDirectory().isPresent()) {
String fileName = DATE_TIME_FORMATTER.format(LocalDateTime.now()) + "-" + event + "-"
+ (!isBlank(action) ? action + "-" : "") + deliveryId + ".json";
Path path = checkedConfigProvider.debug().payloadDirectory().get().resolve(fileName);
Expand All @@ -142,7 +161,7 @@ private void handleRequest(RoutingContext routingContext,
Long installationId = extractInstallationId(payloadObject);
String repository = extractRepository(payloadObject);
GitHubEvent gitHubEvent = new GitHubEvent(installationId, checkedConfigProvider.appName().orElse(null), deliveryId,
repository, event, action, payload, payloadObject, "true".equals(replayed) ? true : false);
repository, event, action, payload, payloadObject, replayed);

if (launchMode == LaunchMode.DEVELOPMENT && replayRouteInstance.isResolvable()) {
replayRouteInstance.get().pushEvent(gitHubEvent);
Expand Down
6 changes: 3 additions & 3 deletions runtime/src/main/java/io/quarkiverse/githubapp/runtime/smee/SmeeIoForwarder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,11 +110,11 @@ public void onEvent(HttpEventStreamClient client, Event event) {

try {
JsonNode rootNode = objectMapper.readTree(data);
JsonNode body = rootNode.get("body");
JsonNode rawData = rootNode.get("rawdata");

if (body != null) {
if (rawData != null) {
HttpRequest.Builder requestBuilder = HttpRequest.newBuilder(localUrl)
.POST(BodyPublishers.ofString(objectMapper.writeValueAsString(rootNode.get("body"))));
.POST(BodyPublishers.ofString(objectMapper.writeValueAsString(rootNode.get("rawdata"))));

for (String forwardedHeader : FORWARDED_HEADERS) {
JsonNode headerValue = rootNode.get(forwardedHeader.toLowerCase(Locale.ROOT));
Expand Down
Loading