You are viewing a plain text version of this content. The canonical link for it is here.
Posted to issues@nifi.apache.org by thenatog <gi...@git.apache.org> on 2018/06/04 20:04:53 UTC
[GitHub] nifi pull request #2759: NIFI-5258 - Changed addHeader to setHeader which st...
GitHub user thenatog opened a pull request:
https://github.com/apache/nifi/pull/2759
NIFI-5258 - Changed addHeader to setHeader which stops X-Frame-Option…
…s being added twice to responses. Changed the way docs webapp is created to allow adding the X-Frame-Options header to docs resources too. Added test to check response header.
NIFI-5258 - Added unit test to check header returns as expected.
NIFI-5258 - Fixed * import.
Thank you for submitting a contribution to Apache NiFi.
In order to streamline the review of the contribution we ask you
to ensure the following steps have been taken:
### For all changes:
- [Y] Is there a JIRA ticket associated with this PR? Is it referenced
in the commit message?
- [Y] Does your PR title start with NIFI-XXXX where XXXX is the JIRA number you are trying to resolve? Pay particular attention to the hyphen "-" character.
- [Y] Has your PR been rebased against the latest commit within the target branch (typically master)?
- [Y] Is your initial contribution a single, squashed commit?
### For code changes:
- [Y] Have you ensured that the full suite of tests is executed via mvn -Pcontrib-check clean install at the root nifi folder?
- [Y] Have you written or updated unit tests to verify your changes?
- [Y] If adding new dependencies to the code, are these dependencies licensed in a way that is compatible for inclusion under [ASF 2.0](http://www.apache.org/legal/resolved.html#category-a)?
- [ ] If applicable, have you updated the LICENSE file, including the main LICENSE file under nifi-assembly?
- [ ] If applicable, have you updated the NOTICE file, including the main NOTICE file found under nifi-assembly?
- [ ] If adding new Properties, have you added .displayName in addition to .name (programmatic access) for each of the new properties?
### For documentation related changes:
- [ ] Have you ensured that format looks appropriate for the output in which it is rendered?
### Note:
Please ensure that once the PR is submitted, you check travis-ci for build issues and submit an update to your PR as soon as possible.
You can merge this pull request into a Git repository by running:
$ git pull https://github.com/thenatog/nifi NIFI-5258-rebased
Alternatively you can review and apply these changes as the patch at:
https://github.com/apache/nifi/pull/2759.patch
To close this pull request, make a commit to your master/trunk branch
with (at least) the following in the commit message:
This closes #2759
----
commit fccd392054c1c43ac61add9bd456ab6ede367693
Author: thenatog <th...@...>
Date: 2018-05-30T20:53:28Z
NIFI-5258 - Changed addHeader to setHeader which stops X-Frame-Options being added twice to responses. Changed the way docs webapp is created to allow adding the X-Frame-Options header to docs resources too. Added test to check response header.
NIFI-5258 - Added unit test to check header returns as expected.
NIFI-5258 - Fixed * import.
----
---
[GitHub] nifi issue #2759: NIFI-5258 - Changed addHeader to setHeader which stops X-F...
Posted by alopresto <gi...@git.apache.org>.
Github user alopresto commented on the issue:
https://github.com/apache/nifi/pull/2759
---
[GitHub] nifi issue #2759: NIFI-5258 - Changed addHeader to setHeader which stops X-F...
Posted by alopresto <gi...@git.apache.org>.
Github user alopresto commented on the issue:
https://github.com/apache/nifi/pull/2759
Reviewing...
---
[GitHub] nifi issue #2759: NIFI-5258 - Changed addHeader to setHeader which stops X-F...
Posted by alopresto <gi...@git.apache.org>.
Github user alopresto commented on the issue:
https://github.com/apache/nifi/pull/2759
I think the issue is that the link from that menu goes to `http://localhost:8080/nifi-docs/documentation` when the correct URL is `http://localhost:8080/nifi-docs/html/overview.html`. If that URL is entered manually, the correct resources are served to the browser.
---
[GitHub] nifi issue #2759: NIFI-5258 - Changed addHeader to setHeader which stops X-F...
Posted by alopresto <gi...@git.apache.org>.
Github user alopresto commented on the issue:
https://github.com/apache/nifi/pull/2759
@thenatog can you close this PR please, as the functionality was added in PR 2791 and PR 2812. Thanks.
---
[GitHub] nifi pull request #2759: NIFI-5258 - Changed addHeader to setHeader which st...
Posted by alopresto <gi...@git.apache.org>.
Github user alopresto commented on a diff in the pull request:
https://github.com/apache/nifi/pull/2759#discussion_r192902457
--- Diff: nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-jetty/src/main/java/org/apache/nifi/web/server/JettyServer.java ---
@@ -516,30 +518,37 @@ private WebAppContext loadWar(final File warFile, final String contextPath, fina
private ContextHandler createDocsWebApp(final String contextPath) {
try {
- final ResourceHandler resourceHandler = new ResourceHandler();
- resourceHandler.setDirectoriesListed(false);
-
final File docsDir = getDocsDir("docs");
final Resource docsResource = Resource.newResource(docsDir);
- // load the component documentation working directory
+ // Load the component documentation working directory
final File componentDocsDirPath = props.getComponentDocumentationWorkingDirectory();
final File workingDocsDirectory = getWorkingDocsDirectory(componentDocsDirPath);
final Resource workingDocsResource = Resource.newResource(workingDocsDirectory);
final File webApiDocsDir = getWebApiDocsDir();
final Resource webApiDocsResource = Resource.newResource(webApiDocsDir);
- // create resources for both docs locations
+ // Create resources for all docs locations
final ResourceCollection resources = new ResourceCollection(docsResource, workingDocsResource, webApiDocsResource);
- resourceHandler.setBaseResource(resources);
- // create the context handler
- final ContextHandler handler = new ContextHandler(contextPath);
- handler.setHandler(resourceHandler);
+
+ // The below ServletContext and Servlet API usage was derived from https://stackoverflow.com/a/34277268.
+ // Thanks go to Stack Overflow user Joakim Erdfelt.
--- End diff --
I think referencing a resource is ok but personal callouts aren't unless the code is derived from something under license to them? @joewitt can you please advise?
---
[GitHub] nifi issue #2759: NIFI-5258 - Changed addHeader to setHeader which stops X-F...
Posted by alopresto <gi...@git.apache.org>.
Github user alopresto commented on the issue:
https://github.com/apache/nifi/pull/2759
@thenatog when I deploy this, I get a 404 when I try to access the documentation (*Global menu* > *Help*). I think the context handler needs to be re-evaluated.
---
[GitHub] nifi pull request #2759: NIFI-5258 - Changed addHeader to setHeader which st...
Posted by thenatog <gi...@git.apache.org>.
Github user thenatog closed the pull request at:
https://github.com/apache/nifi/pull/2759
---