-
Notifications
You must be signed in to change notification settings - Fork 263
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'main' into implement-registry-event-source
- Loading branch information
Showing
342 changed files
with
5,393 additions
and
1,508 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -28,13 +28,27 @@ jobs: | |
| steps: | ||
| - name: Checkout Code | ||
| uses: actions/checkout@v3 | ||
|
|
||
| - name: Enable port-forwarding | ||
| run: | | ||
| sudo apt-get -y install socat | ||
| - name: Setup Minikube-Kubernetes | ||
| uses: manusa/[email protected] | ||
| with: | ||
| minikube version: v1.28.0 | ||
| kubernetes version: v1.25.0 | ||
| github token: ${{ secrets.GITHUB_TOKEN }} | ||
| start args: '--force' | ||
|
|
||
| - name: Enable minikube ingress | ||
| run: | | ||
| minikube addons enable ingress | ||
| - name: Setup minikube tunnel | ||
| run: | | ||
| minikube tunnel & | ||
| - name: Set up JDK 17 | ||
| uses: actions/setup-java@v3 | ||
| with: | ||
|
|
@@ -49,7 +63,6 @@ jobs: | |
| mkdir -p /tmp/coreutils-workaround | ||
| ( cd /tmp/coreutils-workaround && mvn dependency:get -DremoteRepositories=https://repo1.maven.org/maven2 -Dartifact=com.github.java-json-tools:jackson-coreutils:2.0 ) | ||
| - name: Run the tests in local mode | ||
| run: ./mvnw clean verify -P '!external_repos' -DskipOperatorTests=false -pl operator/controller -am | ||
|
|
||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
19 changes: 15 additions & 4 deletions
19
app/src/main/java/io/apicurio/registry/rest/AuthenticationFailedExceptionMapper.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,12 +1,23 @@ | ||
| package io.apicurio.registry.rest; | ||
|
|
||
| import io.quarkus.security.AuthenticationFailedException; | ||
| import io.quarkus.security.UnauthorizedException; | ||
| import jakarta.annotation.Priority; | ||
| import jakarta.inject.Inject; | ||
| import jakarta.ws.rs.Priorities; | ||
| import jakarta.ws.rs.core.Response; | ||
| import jakarta.ws.rs.ext.ExceptionMapper; | ||
| import jakarta.ws.rs.ext.Provider; | ||
|
|
||
| @Provider | ||
| @Priority(Priorities.AUTHENTICATION) | ||
| public class AuthenticationFailedExceptionMapper implements ExceptionMapper<UnauthorizedException> { | ||
|
|
||
| @Inject | ||
| RegistryExceptionMapper exceptionMapperService; | ||
|
|
||
| public class AuthenticationFailedExceptionMapper implements ExceptionMapper<AuthenticationFailedException> { | ||
| @Override | ||
| public Response toResponse(AuthenticationFailedException exception) { | ||
| return Response.status(401).build(); | ||
| public Response toResponse(UnauthorizedException exception) { | ||
| Response errorHttpResponse = exceptionMapperService.toResponse(exception); | ||
| return Response.status(401).entity(errorHttpResponse).build(); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
133 changes: 0 additions & 133 deletions
133
app/src/main/java/io/apicurio/registry/rest/v2/AbstractResourceImpl.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,143 +1,10 @@ | ||
| package io.apicurio.registry.rest.v2; | ||
|
|
||
| import io.apicurio.common.apps.config.Info; | ||
| import io.apicurio.registry.content.TypedContent; | ||
| import io.apicurio.registry.content.dereference.ContentDereferencer; | ||
| import io.apicurio.registry.content.refs.JsonPointerExternalReference; | ||
| import io.apicurio.registry.storage.RegistryStorage; | ||
| import io.apicurio.registry.storage.dto.ArtifactReferenceDto; | ||
| import io.apicurio.registry.types.Current; | ||
| import io.apicurio.registry.types.provider.ArtifactTypeUtilProvider; | ||
| import io.apicurio.registry.types.provider.ArtifactTypeUtilProviderFactory; | ||
| import io.apicurio.registry.utils.StringUtil; | ||
| import jakarta.inject.Inject; | ||
| import jakarta.servlet.http.HttpServletRequest; | ||
| import jakarta.ws.rs.core.Context; | ||
| import org.eclipse.microprofile.config.inject.ConfigProperty; | ||
| import org.slf4j.Logger; | ||
|
|
||
| import java.net.URI; | ||
| import java.net.URISyntaxException; | ||
| import java.net.URLEncoder; | ||
| import java.nio.charset.StandardCharsets; | ||
| import java.util.HashMap; | ||
| import java.util.List; | ||
| import java.util.Map; | ||
|
|
||
| public abstract class AbstractResourceImpl { | ||
|
|
||
| @Inject | ||
| Logger log; | ||
|
|
||
| @Inject | ||
| @Current | ||
| RegistryStorage storage; | ||
|
|
||
| @Inject | ||
| ArtifactTypeUtilProviderFactory factory; | ||
|
|
||
| @Context | ||
| HttpServletRequest request; | ||
|
|
||
| @ConfigProperty(name = "apicurio.apis.v2.base-href", defaultValue = "_") | ||
| @Info(category = "api", description = "API base href (URI)", availableSince = "2.5.0.Final") | ||
| String apiBaseHref; | ||
|
|
||
| /** | ||
| * Handle the content references based on the value of "dereference" - this can mean we need to fully | ||
| * dereference the content. | ||
| * | ||
| * @param dereference | ||
| * @param content | ||
| */ | ||
| protected TypedContent handleContentReferences(boolean dereference, String artifactType, | ||
| TypedContent content, List<ArtifactReferenceDto> references) { | ||
| // Dereference or rewrite references | ||
| if (!references.isEmpty() && dereference) { | ||
| ArtifactTypeUtilProvider artifactTypeProvider = factory.getArtifactTypeProvider(artifactType); | ||
| ContentDereferencer contentDereferencer = artifactTypeProvider.getContentDereferencer(); | ||
| Map<String, TypedContent> resolvedReferences = storage.resolveReferences(references); | ||
| content = contentDereferencer.dereference(content, resolvedReferences); | ||
| } | ||
| return content; | ||
| } | ||
|
|
||
| /** | ||
| * Convert the list of references into a list of REST API URLs that point to the content. This means that | ||
| * we generate a REST API URL from the GAV (groupId, artifactId, version) information found in each | ||
| * reference. | ||
| * | ||
| * @param references | ||
| */ | ||
| protected Map<String, String> resolveReferenceUrls(List<ArtifactReferenceDto> references) { | ||
| Map<String, String> rval = new HashMap<>(); | ||
| for (ArtifactReferenceDto reference : references) { | ||
| String resolvedReferenceUrl = resolveReferenceUrl(reference); | ||
| if (reference.getName().contains("#")) { | ||
| JsonPointerExternalReference jpRef = new JsonPointerExternalReference(reference.getName()); | ||
| resolvedReferenceUrl = resolvedReferenceUrl + jpRef.getComponent(); | ||
| } | ||
| if (resolvedReferenceUrl != null) { | ||
| rval.put(reference.getName(), resolvedReferenceUrl); | ||
| } | ||
| } | ||
| return rval; | ||
| } | ||
|
|
||
| /** | ||
| * Convert a single artifact reference to a REST API URL. This means that we generate a REST API URL from | ||
| * the GAV (groupId, artifactId, version) information found in the reference. | ||
| * | ||
| * @param reference | ||
| */ | ||
| protected String resolveReferenceUrl(ArtifactReferenceDto reference) { | ||
| URI baseHref = null; | ||
| try { | ||
| if (!"_".equals(apiBaseHref)) { | ||
| baseHref = new URI(apiBaseHref); | ||
| } else { | ||
| baseHref = getApiBaseHrefFromXForwarded(request); | ||
| if (baseHref == null) { | ||
| baseHref = getApiBaseHrefFromRequest(request); | ||
| } | ||
| } | ||
| } catch (URISyntaxException e) { | ||
| this.log.error("Error trying to determine the baseHref of the REST API.", e); | ||
| return null; | ||
| } | ||
|
|
||
| if (baseHref == null) { | ||
| this.log.warn("Failed to determine baseHref for the REST API."); | ||
| return null; | ||
| } | ||
|
|
||
| String path = String.format("/apis/registry/v2/groups/%s/artifacts/%s/versions/%s?references=REWRITE", | ||
| URLEncoder.encode(reference.getGroupId(), StandardCharsets.UTF_8), | ||
| URLEncoder.encode(reference.getArtifactId(), StandardCharsets.UTF_8), | ||
| URLEncoder.encode(reference.getVersion(), StandardCharsets.UTF_8)); | ||
| return baseHref.resolve(path).toString(); | ||
| } | ||
|
|
||
| /** | ||
| * Resolves a host name from the information found in X-Forwarded-Host and X-Forwarded-Proto. | ||
| */ | ||
| private static URI getApiBaseHrefFromXForwarded(HttpServletRequest request) throws URISyntaxException { | ||
| String fproto = request.getHeader("X-Forwarded-Proto"); | ||
| String fhost = request.getHeader("X-Forwarded-Host"); | ||
| if (!StringUtil.isEmpty(fproto) && !StringUtil.isEmpty(fhost)) { | ||
| return new URI(fproto + "://" + fhost); | ||
| } else { | ||
| return null; | ||
| } | ||
| } | ||
|
|
||
| /** | ||
| * Resolves a host name from the request information. | ||
| */ | ||
| private static URI getApiBaseHrefFromRequest(HttpServletRequest request) throws URISyntaxException { | ||
| String requestUrl = request.getRequestURL().toString(); | ||
| URI requestUri = new URI(requestUrl); | ||
| return requestUri.resolve("/"); | ||
| } | ||
|
|
||
| } |
Oops, something went wrong.