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.

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

Bugfixes & Improvements from testing implementation @ Alfred API #23

Merged
merged 1 commit into from
Oct 27, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 0 additions & 5 deletions alfresco-mvc-bom/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -44,11 +44,6 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>

<modules>
<module>alfresco-mvc-rest</module>
<module>alfresco-mvc-aop</module>
</modules>

<dependencyManagement>
<dependencies>
<dependency>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@
import org.springframework.http.converter.json.MappingJackson2HttpMessageConverter;
import org.springframework.lang.Nullable;
import org.springframework.web.method.support.HandlerMethodArgumentResolver;
import org.springframework.web.multipart.MultipartResolver;
import org.springframework.web.multipart.commons.CommonsMultipartResolver;
import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;

Expand All @@ -51,6 +52,8 @@
import com.gradecak.alfresco.mvc.rest.jackson.Jackson2QnameDeserializer;
import com.gradecak.alfresco.mvc.rest.jackson.Jackson2QnameSerializer;

import javax.servlet.http.HttpServletRequest;

@Configuration
public class DefaultAlfrescoMvcServletContextConfiguration implements WebMvcConfigurer {

Expand All @@ -75,15 +78,20 @@ public AlfrescoApiResponseInterceptor alfrescoResponseInterceptor(ResourceWebScr
}

@Bean
public CommonsMultipartResolver multipartResolver() {
final CommonsMultipartResolver resolver = new CommonsMultipartResolver();
public MultipartResolver multipartResolver() {
MultipartResolver resolver = createMultipartResolver();
configureMultipartResolver(resolver);
return resolver;
}

protected MultipartResolver createMultipartResolver() {
CommonsMultipartResolver resolver = new CommonsMultipartResolver();
resolver.setMaxUploadSize(-1);
resolver.setDefaultEncoding("utf-8");
configureMultipartResolver(resolver);
return resolver;
}

void configureMultipartResolver(final CommonsMultipartResolver resolver) {
protected void configureMultipartResolver(final MultipartResolver resolver) {
}

@Bean
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,9 @@
package com.gradecak.alfresco.mvc.webscript;

import java.io.IOException;
import java.io.UnsupportedEncodingException;
import java.net.URLDecoder;
import java.nio.charset.StandardCharsets;
import java.util.Arrays;
import java.util.Collections;
import java.util.EnumSet;
Expand Down Expand Up @@ -52,6 +55,7 @@
import org.springframework.extensions.webscripts.AbstractWebScript;
import org.springframework.extensions.webscripts.WebScriptRequest;
import org.springframework.extensions.webscripts.WebScriptResponse;
import org.springframework.extensions.webscripts.WrappingWebScriptRequest;
import org.springframework.extensions.webscripts.WrappingWebScriptResponse;
import org.springframework.extensions.webscripts.servlet.WebScriptServletRequest;
import org.springframework.extensions.webscripts.servlet.WebScriptServletResponse;
Expand Down Expand Up @@ -94,10 +98,14 @@ public DispatcherWebscript(final String servletName, boolean inheritGlobalProper
}

public void execute(WebScriptRequest req, WebScriptResponse res) throws IOException {
WebScriptServletRequest origReq;
if(req instanceof WrappingWebScriptRequest) {
origReq = (WebScriptServletRequest)((WrappingWebScriptRequest) req).getNext();
} else {
origReq = (WebScriptServletRequest) req;
}

final WebScriptServletRequest origReq = (WebScriptServletRequest) req;

WebScriptServletResponse wsr = null;
WebScriptServletResponse wsr;
if (res instanceof WrappingWebScriptResponse) {
wsr = (WebScriptServletResponse) ((WrappingWebScriptResponse) res).getNext();
} else {
Expand All @@ -113,6 +121,7 @@ public void execute(WebScriptRequest req, WebScriptResponse res) throws IOExcept
s.service(wrapper, sr);

} catch (Throwable e) {
LOGGER.error("Failed to call {}", origReq.getURL());
throw new IOException(e);
}
}
Expand Down Expand Up @@ -253,6 +262,15 @@ public WebscriptRequestWrapper(WebScriptServletRequest request) {
@Override
public String getRequestURI() {
String uri = super.getRequestURI();
try {
uri = URLDecoder.decode(uri, StandardCharsets.UTF_8.toString());
} catch (UnsupportedEncodingException e) {
LOGGER.error(e.getMessage(), e);
return "";
}

LOGGER.debug("Processing [{}] {}", super.getMethod(), uri);

if (uri.contains("$")) {
uri = uri.replaceAll("\\$", "%24");
}
Expand All @@ -263,12 +281,17 @@ public String getRequestURI() {
}

Pattern pattern = Pattern
.compile("(^" + origReq.getServiceContextPath() + "/)(.*)(/" + Pattern.quote(origUri) + ")");
.compile(
"(^" + origReq.getServiceContextPath() + "/)" +
"(.*)" +
"(/" + Pattern.quote(origUri) + ")"
);
Matcher matcher = pattern.matcher(uri);

if (matcher.find()) {
try {
return matcher.group(EXTENSION_PATH_REGEXP_GROUP_INDEX);
String result = matcher.group(EXTENSION_PATH_REGEXP_GROUP_INDEX);
LOGGER.debug("Found [{}] {} ---> {}", super.getMethod(), uri, result);
return result;
} catch (Exception e) {
// let an empty string be returned
LOGGER.warn("no such group (3) in regexp while URI evaluation", e);
Expand Down