Skip to content

Fixed #1674: duplicated route prefix in profiler urls #1685

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
merged 2 commits into from
Aug 15, 2021
Merged

Fixed #1674: duplicated route prefix in profiler urls #1685

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b43e9b1
Fixed #1674: duplicated route prefix in profiler urls (tests)
adamwojs Aug 1, 2021
360a03c
Fixed #1674: duplicated route prefix in profiler urls
adamwojs Aug 1, 2021
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
7 changes: 6 additions & 1 deletion src/main/java/fr/adrienbrault/idea/symfony2plugin/profiler/utils/ProfilerUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ public static Collection<ProfilerRequestInterface> createRequestsFromIndexHtml(@
if(tokenLink != null) {
String href = tokenLink.getAttributeValue("href");
if(StringUtils.isNotBlank(href)) {
profilerUrl = StringUtils.stripEnd(baseUrl, "/") + href;
profilerUrl = getProfilerAbsoluteUrl(baseUrl, href);
}
}

Expand All @@ -153,6 +153,11 @@ public static Collection<ProfilerRequestInterface> createRequestsFromIndexHtml(@
return requests;
}

@NotNull
private static String getProfilerAbsoluteUrl(@NotNull String baseUrl, @NotNull String href) {
return StringUtils.stripEnd(baseUrl, "/") + href.substring(href.indexOf("/_profiler/"));
}

@NotNull
public static Collection<ProfilerRequestInterface> collectHttpDataForRequest(@NotNull Project project, @NotNull Collection<ProfilerRequestInterface> requests) {
Collection<Callable<ProfilerRequestInterface>> callable = requests.stream().map(
Expand Down
16 changes: 16 additions & 0 deletions src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/profiler/ProfilerUtilTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,22 @@ public void testCreateRequestsFromIndexHtml() {
assertEquals(404, request.getStatusCode());
}

/**
* @see ProfilerUtil#createRequestsFromIndexHtml
*/
public void testCreateRequestsFromIndexHtmlRemovesProfilerRoutePrefixFromTokenLinks() {
PsiFile psiFile = myFixture.configureByFile("profiler-index-with-route-prefix.html");
Collection<ProfilerRequestInterface> requests = ProfilerUtil.createRequestsFromIndexHtml(getProject(), psiFile.getText(), "http://127.0.0.1:8000/prefix/");

ProfilerRequestInterface request = requests.iterator().next();

assertEquals("a9eaab", request.getHash());
assertEquals("GET", request.getMethod());
assertEquals("http://127.0.0.1:8000/prefix/_profiler/search/results?ip=&amp;limit=10", request.getUrl());
assertEquals("http://127.0.0.1:8000/prefix/_profiler/a9eaab", request.getProfilerUrl());
assertEquals(404, request.getStatusCode());
}

/**
* @see ProfilerUtil#getRequestAttributes
*/
Expand Down
Loading