Skip to content

Commit

Permalink
[fc] Repository: plonetheme.classic
Browse files Browse the repository at this point in the history 
Branch: refs/heads/master
Date: 2019-10-31T12:51:31+01:00
Author: Maurits van Rees (mauritsvanrees) <maurits@vanrees.org>
Commit: plone/plonetheme.classic@25294d0

Removed broken X-XSS-Protection header.

Fixes plone/Products.CMFPlone#2964 for the Plone Classic Theme.

Files changed:
M CHANGES.txt
M plonetheme/classic/skins/classic_templates/main_template.pt
Repository: plonetheme.classic

Branch: refs/heads/master
Date: 2019-12-03T13:47:15+01:00
Author: Jens W. Klein (jensens) <jk@kleinundpartner.at>
Commit: plone/plonetheme.classic@feb43db

Merge pull request #8 from plone/maurits/issue-2964-remove-broken-x-xss-protection-header

Removed broken X-XSS-Protection header.

Files changed:
M CHANGES.txt
M plonetheme/classic/skins/classic_templates/main_template.pt
  • Loading branch information
@jensens
jensens committed Dec 3, 2019
1 parent 9dcfb21 commit 96be68a
Showing 1 changed file with 18 additions and 21 deletions.
39 changes: 18 additions & 21 deletions last_commit.txt
View file
Original file line number Diff line number Diff line change
@@ -1,39 +1,36 @@
Repository: plone.app.robotframework
Repository: plonetheme.classic


Branch: refs/heads/1.2.x
Date: 2019-10-26T18:44:33+02:00
Branch: refs/heads/master
Date: 2019-10-31T12:51:31+01:00
Author: Maurits van Rees (mauritsvanrees) <maurits@vanrees.org>
Commit: https://github.com/plone/plone.app.robotframework/commit/38504a9bba905df82931471fef7d84c41b9ddeb0
Commit: https://github.com/plone/plonetheme.classic/commit/25294d0d4e481b1585ef305fba5bbda872c679cc

Reverted change in 1.2.1 for 'Log in' keyword which failed in Plone 4.3.
Removed broken X-XSS-Protection header.

Revert "Selector of login form matches text"

This reverts commit 9f80a05edceb71ae91e6da4dc69d353f4763863c.
Fixes https://github.com/plone/plone.app.robotframework/issues/107
Fixes https://github.com/plone/Products.CMFPlone/issues/2964 for the Plone Classic Theme.

Files changed:
M CHANGES.rst
M src/plone/app/robotframework/keywords.robot
M CHANGES.txt
M plonetheme/classic/skins/classic_templates/main_template.pt

b'diff --git a/CHANGES.rst b/CHANGES.rst\nindex 29eea0b..865146e 100644\n--- a/CHANGES.rst\n+++ b/CHANGES.rst\n@@ -14,7 +14,9 @@ New features:\n \n Bug fixes:\n \n-- *add item here*\n+- Reverted change in 1.2.1 for \'Log in\' keyword which failed in Plone 4.3.\n+ Fixes `issue 107 <https://github.com/plone/plone.app.robotframework/issues/107>`_.\n+ [maurits]\n \n \n 1.2.3 (2019-02-11)\ndiff --git a/src/plone/app/robotframework/keywords.robot b/src/plone/app/robotframework/keywords.robot\nindex 675c713..7c6b8b5 100644\n--- a/src/plone/app/robotframework/keywords.robot\n+++ b/src/plone/app/robotframework/keywords.robot\n@@ -67,10 +67,10 @@ Log in\n Go to ${PLONE_URL}/login_form\n Page should contain element __ac_name\n Page should contain element __ac_password\n- Page should contain element xpath: //input[contains(text(), "Log in")]\n+ Page should contain element css=#login-form .formControls input[name=submit]\n Input text for sure __ac_name ${userid}\n Input text for sure __ac_password ${password}\n- Click Button xpath: //input[contains(text(), "Log in")]\n+ Click Button css=#login-form .formControls input[name=submit]\n \n Log in as test user\n \n'
b'diff --git a/CHANGES.txt b/CHANGES.txt\nindex 9eab5ea..28b609c 100644\n--- a/CHANGES.txt\n+++ b/CHANGES.txt\n@@ -14,7 +14,9 @@ New features:\n \n Bug fixes:\n \n-- *add item here*\n+- Removed broken ``X-XSS-Protection`` header.\n+ Fixes `issue 2964 <https://github.com/plone/Products.CMFPlone/issues/2964>`_.\n+ [maurits]\n \n \n 1.5.0 (2018-09-27)\ndiff --git a/plonetheme/classic/skins/classic_templates/main_template.pt b/plonetheme/classic/skins/classic_templates/main_template.pt\nindex 4785a50..8de8d12 100644\n--- a/plonetheme/classic/skins/classic_templates/main_template.pt\n+++ b/plonetheme/classic/skins/classic_templates/main_template.pt\n@@ -21,8 +21,7 @@\n ajax_load request/ajax_load | nothing;\n ajax_include_head request/ajax_include_head | nothing;\n dummy python:request.RESPONSE.setHeader(\'X-UA-Compatible\', \'IE=edge,chrome=1\');\n- dummy python:request.RESPONSE.setHeader(\'X-Content-Type-Options\', \'nosniff\');\n- dummy python:request.RESPONSE.setHeader(\'X-XSS-Protection\', \'1; mode=block\');"\n+ dummy python:request.RESPONSE.setHeader(\'X-Content-Type-Options\', \'nosniff\');"\n tal:attributes="lang lang;\n xml:lang lang">\n \n'

Repository: plone.app.robotframework
Repository: plonetheme.classic


Branch: refs/heads/1.2.x
Date: 2019-10-28T20:13:28+01:00
Branch: refs/heads/master
Date: 2019-12-03T13:47:15+01:00
Author: Jens W. Klein (jensens) <jk@kleinundpartner.at>
Commit: https://github.com/plone/plone.app.robotframework/commit/d814142f69a189491543f1fd2eef88c6aee1513a
Commit: https://github.com/plone/plonetheme.classic/commit/feb43db6ae3d91cea40a01d2feac5171e6fc09d8

Merge pull request #113 from plone/maurits/issue-107-login-keyword-12x
Merge pull request #8 from plone/maurits/issue-2964-remove-broken-x-xss-protection-header

Reverted change in 1.2.1 for 'Log in' keyword which failed in Plone 4.3.
Removed broken X-XSS-Protection header.

Files changed:
M CHANGES.rst
M src/plone/app/robotframework/keywords.robot
M CHANGES.txt
M plonetheme/classic/skins/classic_templates/main_template.pt

b'diff --git a/CHANGES.rst b/CHANGES.rst\nindex 29eea0b..865146e 100644\n--- a/CHANGES.rst\n+++ b/CHANGES.rst\n@@ -14,7 +14,9 @@ New features:\n \n Bug fixes:\n \n-- *add item here*\n+- Reverted change in 1.2.1 for \'Log in\' keyword which failed in Plone 4.3.\n+ Fixes `issue 107 <https://github.com/plone/plone.app.robotframework/issues/107>`_.\n+ [maurits]\n \n \n 1.2.3 (2019-02-11)\ndiff --git a/src/plone/app/robotframework/keywords.robot b/src/plone/app/robotframework/keywords.robot\nindex 675c713..7c6b8b5 100644\n--- a/src/plone/app/robotframework/keywords.robot\n+++ b/src/plone/app/robotframework/keywords.robot\n@@ -67,10 +67,10 @@ Log in\n Go to ${PLONE_URL}/login_form\n Page should contain element __ac_name\n Page should contain element __ac_password\n- Page should contain element xpath: //input[contains(text(), "Log in")]\n+ Page should contain element css=#login-form .formControls input[name=submit]\n Input text for sure __ac_name ${userid}\n Input text for sure __ac_password ${password}\n- Click Button xpath: //input[contains(text(), "Log in")]\n+ Click Button css=#login-form .formControls input[name=submit]\n \n Log in as test user\n \n'
b'diff --git a/CHANGES.txt b/CHANGES.txt\nindex 9eab5ea..28b609c 100644\n--- a/CHANGES.txt\n+++ b/CHANGES.txt\n@@ -14,7 +14,9 @@ New features:\n \n Bug fixes:\n \n-- *add item here*\n+- Removed broken ``X-XSS-Protection`` header.\n+ Fixes `issue 2964 <https://github.com/plone/Products.CMFPlone/issues/2964>`_.\n+ [maurits]\n \n \n 1.5.0 (2018-09-27)\ndiff --git a/plonetheme/classic/skins/classic_templates/main_template.pt b/plonetheme/classic/skins/classic_templates/main_template.pt\nindex 4785a50..8de8d12 100644\n--- a/plonetheme/classic/skins/classic_templates/main_template.pt\n+++ b/plonetheme/classic/skins/classic_templates/main_template.pt\n@@ -21,8 +21,7 @@\n ajax_load request/ajax_load | nothing;\n ajax_include_head request/ajax_include_head | nothing;\n dummy python:request.RESPONSE.setHeader(\'X-UA-Compatible\', \'IE=edge,chrome=1\');\n- dummy python:request.RESPONSE.setHeader(\'X-Content-Type-Options\', \'nosniff\');\n- dummy python:request.RESPONSE.setHeader(\'X-XSS-Protection\', \'1; mode=block\');"\n+ dummy python:request.RESPONSE.setHeader(\'X-Content-Type-Options\', \'nosniff\');"\n tal:attributes="lang lang;\n xml:lang lang">\n \n'

0 comments on commit 96be68a

Please sign in to comment.