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

NIFI-5258 - Changed addHeader to setHeader which stops X-Frame-Option… #2759

Closed
wants to merge 2 commits into
base: master
from

Conversation

Projects
None yet
2 participants
@thenatog
Contributor

thenatog commented Jun 4, 2018

…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:

  • Is there a JIRA ticket associated with this PR? Is it referenced
    in the commit message?

  • 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.

  • Has your PR been rebased against the latest commit within the target branch (typically master)?

  • Is your initial contribution a single, squashed commit?

For code changes:

  • Have you ensured that the full suite of tests is executed via mvn -Pcontrib-check clean install at the root nifi folder?
  • Have you written or updated unit tests to verify your changes?
  • If adding new dependencies to the code, are these dependencies licensed in a way that is compatible for inclusion under ASF 2.0?
  • 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.

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.
@alopresto

This comment has been minimized.

Contributor

alopresto commented Jun 4, 2018

Reviewing...

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.

This comment has been minimized.

@alopresto

alopresto Jun 4, 2018

Contributor

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?

@alopresto

This comment has been minimized.

Contributor

alopresto commented Jun 7, 2018

@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.

@alopresto

This comment has been minimized.

Contributor

alopresto commented Jun 7, 2018

screen shot 2018-06-06 at 5 49 23 pm

@alopresto

This comment has been minimized.

Contributor

alopresto commented Jun 7, 2018

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.

@alopresto

This comment has been minimized.

Contributor

alopresto commented Jul 12, 2018

@thenatog can you close this PR please, as the functionality was added in PR 2791 and PR 2812. Thanks.

@thenatog thenatog closed this Jul 12, 2018

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment