KNOX-1323 - Reconcile WebAppSecurity provider X-Frame-Options and 
X-Content-Type-Options param names


Project: http://git-wip-us.apache.org/repos/asf/knox/repo
Commit: http://git-wip-us.apache.org/repos/asf/knox/commit/8ea911cc
Tree: http://git-wip-us.apache.org/repos/asf/knox/tree/8ea911cc
Diff: http://git-wip-us.apache.org/repos/asf/knox/diff/8ea911cc

Branch: refs/heads/master
Commit: 8ea911cc1c7dcd82c397a3d08f4183d0d1e9d7e8
Parents: cfb0ce1
Author: Phil Zampino <pzamp...@apache.org>
Authored: Thu May 17 22:43:58 2018 -0400
Committer: Phil Zampino <pzamp...@apache.org>
Committed: Thu May 17 22:47:32 2018 -0400

----------------------------------------------------------------------
 .../xcontent-type-options-provider-config.ts                     | 2 +-
 .../app/provider-config-wizard/xframeoptions-provider-config.ts  | 4 ++--
 .../src/main/resources/applications/admin-ui/app/index.html      | 2 +-
 .../admin-ui/app/inline.7d53d936befaf09e70af.bundle.js           | 1 +
 .../admin-ui/app/inline.fb5153002b2a19685ca7.bundle.js           | 1 -
 .../admin-ui/app/main.1e38c9da9b0b413c84eb.bundle.js             | 1 +
 .../admin-ui/app/main.67ec1fb6870cefae0ea8.bundle.js             | 1 -
 .../knox/gateway/webappsec/filter/XContentTypeOptionsFilter.java | 2 +-
 .../knox/gateway/webappsec/XContentTypeOptionsFilterTest.java    | 2 +-
 9 files changed, 8 insertions(+), 8 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/knox/blob/8ea911cc/gateway-admin-ui/src/app/provider-config-wizard/xcontent-type-options-provider-config.ts
----------------------------------------------------------------------
diff --git 
a/gateway-admin-ui/src/app/provider-config-wizard/xcontent-type-options-provider-config.ts
 
b/gateway-admin-ui/src/app/provider-config-wizard/xcontent-type-options-provider-config.ts
index b340548..4fb5096 100644
--- 
a/gateway-admin-ui/src/app/provider-config-wizard/xcontent-type-options-provider-config.ts
+++ 
b/gateway-admin-ui/src/app/provider-config-wizard/xcontent-type-options-provider-config.ts
@@ -26,7 +26,7 @@ export class XContentTypeOptionsProviderConfig extends 
WebAppSecurityContributor
   private static displayPropertyNames = [ 
XContentTypeOptionsProviderConfig.VALUE ];
 
   private static displayPropertyNameBindings: Map<string, string> =
-    new Map([ [XContentTypeOptionsProviderConfig.VALUE, 
'xcontent-type.options.value'] ] as [string, string][]);
+    new Map([ [XContentTypeOptionsProviderConfig.VALUE, 
'xcontent-type.options'] ] as [string, string][]);
 
   constructor() {
     super();

http://git-wip-us.apache.org/repos/asf/knox/blob/8ea911cc/gateway-admin-ui/src/app/provider-config-wizard/xframeoptions-provider-config.ts
----------------------------------------------------------------------
diff --git 
a/gateway-admin-ui/src/app/provider-config-wizard/xframeoptions-provider-config.ts
 
b/gateway-admin-ui/src/app/provider-config-wizard/xframeoptions-provider-config.ts
index 900e4d4..7598e5c 100644
--- 
a/gateway-admin-ui/src/app/provider-config-wizard/xframeoptions-provider-config.ts
+++ 
b/gateway-admin-ui/src/app/provider-config-wizard/xframeoptions-provider-config.ts
@@ -28,12 +28,12 @@ export class XFrameOptionsProviderConfig extends 
WebAppSecurityContributor {
   private static displayPropertyNames = [ XFrameOptionsProviderConfig.VALUE ];
 
   private static displayPropertyNameBindings: Map<string, string> =
-    new Map([ [XFrameOptionsProviderConfig.VALUE, 'xframe-options.value'] ] as 
[string, string][]);
+    new Map([ [XFrameOptionsProviderConfig.VALUE, 'xframe.options'] ] as 
[string, string][]);
 
   constructor() {
     super();
     // Set the default values
-    this.setParam('xframe-options.enabled', 'true');
+    this.setParam('xframe.options.enabled', 'true');
     
this.setParam(XFrameOptionsProviderConfig.displayPropertyNameBindings.get(XFrameOptionsProviderConfig.VALUE),
 'DENY');
   }
 

http://git-wip-us.apache.org/repos/asf/knox/blob/8ea911cc/gateway-applications/src/main/resources/applications/admin-ui/app/index.html
----------------------------------------------------------------------
diff --git 
a/gateway-applications/src/main/resources/applications/admin-ui/app/index.html 
b/gateway-applications/src/main/resources/applications/admin-ui/app/index.html
index ea23e07..47486d4 100644
--- 
a/gateway-applications/src/main/resources/applications/admin-ui/app/index.html
+++ 
b/gateway-applications/src/main/resources/applications/admin-ui/app/index.html
@@ -11,4 +11,4 @@
   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
   See the License for the specific language governing permissions and
   limitations under the License.
---><!doctype html><html><head><meta charset="utf-8"><title>Apache Knox 
Manager</title><meta name="viewport" 
content="width=device-width,initial-scale=1"><link rel="icon" 
type="image/x-icon" href="favicon.ico"><meta name="viewport" 
content="width=device-width,initial-scale=1"><!-- Latest compiled and minified 
CSS --><link rel="stylesheet" 
href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css"; 
integrity="sha384-BVYiiSIFeK1dGmJRAkycuHAHRg32OmUcww7on3RYdg4Va+PmSTsz/K68vbdEjh4u"
 crossorigin="anonymous"><!-- Optional theme --><link rel="stylesheet" 
href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap-theme.min.css";
 
integrity="sha384-rHyoN1iRsVXV4nD0JutlnGaslCJuC7uwjduW9SVrLvRYooPp2bWYgmgJQIXwl/Sp"
 crossorigin="anonymous"><!-- Custom styles for this template --><link 
href="assets/sticky-footer.css" rel="stylesheet"><script 
src="https://ajax.googleapis.com/ajax/libs/jquery/3.0.0/jquery.min.js";></script><!--
 Latest compiled and minified JavaScript --><scr
 ipt src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js"; 
integrity="sha384-Tc5IQib027qvyjSMfHjOMaLkfuWVxZxUPnCJA7l2mCWNIpG9mGCD8wGNIcPD7Txa"
 crossorigin="anonymous"></script><script 
src="assets/vkbeautify.js"></script><link 
href="styles.2ee5b7f4cd59a6cf015e.bundle.css" 
rel="stylesheet"/></head><body><div class="navbar-wrapper"><div 
class="container-fluid"><nav class="navbar navbar-inverse 
navbar-static-top"><div class="container-fluid"><div 
class="navbar-header"><button type="button" class="navbar-toggle collapsed" 
data-toggle="collapse" data-target="#navbar" aria-expanded="false" 
aria-controls="navbar"><span class="sr-only">Toggle navigation</span> <span 
class="icon-bar"></span> <span class="icon-bar"></span> <span 
class="icon-bar"></span></button> <a class="navbar-brand" href="#"><img 
style="max-width:200px; margin-top: -9px;" 
src="assets/knox-logo-transparent.gif" alt="Apache Knox 
Manager"></a></div></div></nav></div><!-- Content --><resource-management></res
 ource-management><footer class="footer"><div class="container-fluid"><div>Knox 
Manager Version 
1.0.0</div><gateway-version></gateway-version></div></footer><script 
type="text/javascript" 
src="inline.fb5153002b2a19685ca7.bundle.js"></script><script 
type="text/javascript" 
src="scripts.c50bb762c438ae0f8842.bundle.js"></script><script 
type="text/javascript" 
src="main.67ec1fb6870cefae0ea8.bundle.js"></script></div></body></html>
\ No newline at end of file
+--><!doctype html><html><head><meta charset="utf-8"><title>Apache Knox 
Manager</title><meta name="viewport" 
content="width=device-width,initial-scale=1"><link rel="icon" 
type="image/x-icon" href="favicon.ico"><meta name="viewport" 
content="width=device-width,initial-scale=1"><!-- Latest compiled and minified 
CSS --><link rel="stylesheet" 
href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css"; 
integrity="sha384-BVYiiSIFeK1dGmJRAkycuHAHRg32OmUcww7on3RYdg4Va+PmSTsz/K68vbdEjh4u"
 crossorigin="anonymous"><!-- Optional theme --><link rel="stylesheet" 
href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap-theme.min.css";
 
integrity="sha384-rHyoN1iRsVXV4nD0JutlnGaslCJuC7uwjduW9SVrLvRYooPp2bWYgmgJQIXwl/Sp"
 crossorigin="anonymous"><!-- Custom styles for this template --><link 
href="assets/sticky-footer.css" rel="stylesheet"><script 
src="https://ajax.googleapis.com/ajax/libs/jquery/3.0.0/jquery.min.js";></script><!--
 Latest compiled and minified JavaScript --><scr
 ipt src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js"; 
integrity="sha384-Tc5IQib027qvyjSMfHjOMaLkfuWVxZxUPnCJA7l2mCWNIpG9mGCD8wGNIcPD7Txa"
 crossorigin="anonymous"></script><script 
src="assets/vkbeautify.js"></script><link 
href="styles.2ee5b7f4cd59a6cf015e.bundle.css" 
rel="stylesheet"/></head><body><div class="navbar-wrapper"><div 
class="container-fluid"><nav class="navbar navbar-inverse 
navbar-static-top"><div class="container-fluid"><div 
class="navbar-header"><button type="button" class="navbar-toggle collapsed" 
data-toggle="collapse" data-target="#navbar" aria-expanded="false" 
aria-controls="navbar"><span class="sr-only">Toggle navigation</span> <span 
class="icon-bar"></span> <span class="icon-bar"></span> <span 
class="icon-bar"></span></button> <a class="navbar-brand" href="#"><img 
style="max-width:200px; margin-top: -9px;" 
src="assets/knox-logo-transparent.gif" alt="Apache Knox 
Manager"></a></div></div></nav></div><!-- Content --><resource-management></res
 ource-management><footer class="footer"><div class="container-fluid"><div>Knox 
Manager Version 
1.0.0</div><gateway-version></gateway-version></div></footer><script 
type="text/javascript" 
src="inline.7d53d936befaf09e70af.bundle.js"></script><script 
type="text/javascript" 
src="scripts.c50bb762c438ae0f8842.bundle.js"></script><script 
type="text/javascript" 
src="main.1e38c9da9b0b413c84eb.bundle.js"></script></div></body></html>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/knox/blob/8ea911cc/gateway-applications/src/main/resources/applications/admin-ui/app/inline.7d53d936befaf09e70af.bundle.js
----------------------------------------------------------------------
diff --git 
a/gateway-applications/src/main/resources/applications/admin-ui/app/inline.7d53d936befaf09e70af.bundle.js
 
b/gateway-applications/src/main/resources/applications/admin-ui/app/inline.7d53d936befaf09e70af.bundle.js
new file mode 100644
index 0000000..4123015
--- /dev/null
+++ 
b/gateway-applications/src/main/resources/applications/admin-ui/app/inline.7d53d936befaf09e70af.bundle.js
@@ -0,0 +1 @@
+!function(e){var 
n=window.webpackJsonp;window.webpackJsonp=function(r,c,u){for(var 
a,i,f,l=0,s=[];l<r.length;l++)t[i=r[l]]&&s.push(t[i][0]),t[i]=0;for(a in 
c)Object.prototype.hasOwnProperty.call(c,a)&&(e[a]=c[a]);for(n&&n(r,c,u);s.length;)s.shift()();if(u)for(l=0;l<u.length;l++)f=o(o.s=u[l]);return
 f};var r={},t={2:0};function o(n){if(r[n])return r[n].exports;var 
t=r[n]={i:n,l:!1,exports:{}};return 
e[n].call(t.exports,t,t.exports,o),t.l=!0,t.exports}o.e=function(e){var 
n=t[e];if(0===n)return new Promise(function(e){e()});if(n)return n[2];var r=new 
Promise(function(r,o){n=t[e]=[r,o]});n[2]=r;var 
c=document.getElementsByTagName("head")[0],u=document.createElement("script");u.type="text/javascript",u.charset="utf-8",u.async=!0,u.timeout=12e4,o.nc&&u.setAttribute("nonce",o.nc),u.src=o.p+""+e+"."+{0:"1e38c9da9b0b413c84eb",1:"aed76669724804835353"}[e]+".chunk.js";var
 a=setTimeout(i,12e4);function i(){u.onerror=u.onload=null,clearTimeout(a);var 
n=t[e];0!==n&&(n&&n[1](new Error("Loading chu
 nk "+e+" failed.")),t[e]=void 0)}return 
u.onerror=u.onload=i,c.appendChild(u),r},o.m=e,o.c=r,o.d=function(e,n,r){o.o(e,n)||Object.defineProperty(e,n,{configurable:!1,enumerable:!0,get:r})},o.n=function(e){var
 n=e&&e.__esModule?function(){return e.default}:function(){return e};return 
o.d(n,"a",n),n},o.o=function(e,n){return 
Object.prototype.hasOwnProperty.call(e,n)},o.p="",o.oe=function(e){throw 
console.error(e),e}}([]);
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/knox/blob/8ea911cc/gateway-applications/src/main/resources/applications/admin-ui/app/inline.fb5153002b2a19685ca7.bundle.js
----------------------------------------------------------------------
diff --git 
a/gateway-applications/src/main/resources/applications/admin-ui/app/inline.fb5153002b2a19685ca7.bundle.js
 
b/gateway-applications/src/main/resources/applications/admin-ui/app/inline.fb5153002b2a19685ca7.bundle.js
deleted file mode 100644
index fd7296c..0000000
--- 
a/gateway-applications/src/main/resources/applications/admin-ui/app/inline.fb5153002b2a19685ca7.bundle.js
+++ /dev/null
@@ -1 +0,0 @@
-!function(e){var 
n=window.webpackJsonp;window.webpackJsonp=function(r,c,a){for(var 
u,i,f,l=0,s=[];l<r.length;l++)t[i=r[l]]&&s.push(t[i][0]),t[i]=0;for(u in 
c)Object.prototype.hasOwnProperty.call(c,u)&&(e[u]=c[u]);for(n&&n(r,c,a);s.length;)s.shift()();if(a)for(l=0;l<a.length;l++)f=o(o.s=a[l]);return
 f};var r={},t={2:0};function o(n){if(r[n])return r[n].exports;var 
t=r[n]={i:n,l:!1,exports:{}};return 
e[n].call(t.exports,t,t.exports,o),t.l=!0,t.exports}o.e=function(e){var 
n=t[e];if(0===n)return new Promise(function(e){e()});if(n)return n[2];var r=new 
Promise(function(r,o){n=t[e]=[r,o]});n[2]=r;var 
c=document.getElementsByTagName("head")[0],a=document.createElement("script");a.type="text/javascript",a.charset="utf-8",a.async=!0,a.timeout=12e4,o.nc&&a.setAttribute("nonce",o.nc),a.src=o.p+""+e+"."+{0:"67ec1fb6870cefae0ea8",1:"aed76669724804835353"}[e]+".chunk.js";var
 u=setTimeout(i,12e4);function i(){a.onerror=a.onload=null,clearTimeout(u);var 
n=t[e];0!==n&&(n&&n[1](new Error("Loading chu
 nk "+e+" failed.")),t[e]=void 0)}return 
a.onerror=a.onload=i,c.appendChild(a),r},o.m=e,o.c=r,o.d=function(e,n,r){o.o(e,n)||Object.defineProperty(e,n,{configurable:!1,enumerable:!0,get:r})},o.n=function(e){var
 n=e&&e.__esModule?function(){return e.default}:function(){return e};return 
o.d(n,"a",n),n},o.o=function(e,n){return 
Object.prototype.hasOwnProperty.call(e,n)},o.p="",o.oe=function(e){throw 
console.error(e),e}}([]);
\ No newline at end of file

Reply via email to