Skip to content

Commit

Permalink
Sanitize HTML output for log viewer
Browse files Browse the repository at this point in the history
Fixes Fixes CVE-2017-7534
Bumps origin-web-common to 3.6.2
  • Loading branch information
spadgett committed Apr 12, 2018
1 parent 6a3972a commit b564ba0
Show file tree
Hide file tree
Showing 2 changed files with 31 additions and 31 deletions.
4 changes: 2 additions & 2 deletions bower.json
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
"angular-moment": "1.0.0",
"angular-utf8-base64": "0.0.5",
"file-saver": "1.3.3",
"origin-web-common": "3.6.1",
"origin-web-common": "3.6.2",
"origin-web-catalog": "0.0.31"
},
"devDependencies": {
Expand All @@ -56,7 +56,7 @@
},
"appPath": "app",
"resolutions": {
"origin-web-common": "3.6.1",
"origin-web-common": "3.6.2",
"angular-bootstrap": "0.14.3",
"d3": "3.5.17",
"patternfly": "3.24.0",
Expand Down
58 changes: 29 additions & 29 deletions dist/scripts/vendor.js
Original file line number Diff line number Diff line change
Expand Up @@ -62049,60 +62049,60 @@ return {
startTour:k,
cancelTour:l
};
}), angular.module("openshiftCommonUI").factory("HTMLService", [ "BREAKPOINTS", function(a) {
var b = "xxs", c = "xs", d = "sm", e = "md", f = "lg";
}), angular.module("openshiftCommonUI").factory("HTMLService", [ "$sanitize", "BREAKPOINTS", function(a, b) {
var c = "xxs", d = "xs", e = "sm", f = "md", g = "lg";
return {
WINDOW_SIZE_XXS:b,
WINDOW_SIZE_XS:c,
WINDOW_SIZE_SM:d,
WINDOW_SIZE_MD:e,
WINDOW_SIZE_LG:f,
WINDOW_SIZE_XXS:c,
WINDOW_SIZE_XS:d,
WINDOW_SIZE_SM:e,
WINDOW_SIZE_MD:f,
WINDOW_SIZE_LG:g,
getBreakpoint:function() {
return window.innerWidth < a.screenXsMin ? b :window.innerWidth < a.screenSmMin ? c :window.innerWidth < a.screenMdMin ? d :window.innerWidth < a.screenLgMin ? e :f;
return window.innerWidth < b.screenXsMin ? c :window.innerWidth < b.screenSmMin ? d :window.innerWidth < b.screenMdMin ? e :window.innerWidth < b.screenLgMin ? f :g;
},
isWindowBelowBreakpoint:function(g) {
switch (g) {
case b:
return !1;

isWindowBelowBreakpoint:function(a) {
switch (a) {
case c:
return window.innerWidth < a.screenXsMin;
return !1;

case d:
return window.innerWidth < a.screenSmMin;
return window.innerWidth < b.screenXsMin;

case e:
return window.innerWidth < a.screenMdMin;
return window.innerWidth < b.screenSmMin;

case f:
return window.innerWidth < a.screenLgMin;
return window.innerWidth < b.screenMdMin;

case g:
return window.innerWidth < b.screenLgMin;

default:
return !0;
}
},
isWindowAboveBreakpoint:function(b) {
switch (b) {
case c:
return window.innerWidth >= a.screenXsMin;

isWindowAboveBreakpoint:function(a) {
switch (a) {
case d:
return window.innerWidth >= a.screenSmMin;
return window.innerWidth >= b.screenXsMin;

case e:
return window.innerWidth >= a.screenMdMin;
return window.innerWidth >= b.screenSmMin;

case f:
return window.innerWidth >= a.screenLgMin;
return window.innerWidth >= b.screenMdMin;

case g:
return window.innerWidth >= b.screenLgMin;

default:
return !0;
}
},
linkify:function(a, b, c) {
return a ? (c || (a = _.escape(a)), a.replace(/https?:\/\/[A-Za-z0-9._%+-]+\S*[^\s.;,(){}<>"\u201d\u2019]/gm, function(a) {
return b ? '<a href="' + a + '" target="' + b + '">' + a + "</a>" :'<a href="' + a + '">' + a + "</a>";
})) :a;
linkify:function(b, c, d) {
return b ? (d || (b = _.escape(b)), a(b.replace(/https?:\/\/[A-Za-z0-9._%+-]+\S*[^\s.;,(){}<>"\u201d\u2019]/gm, function(a) {
return c ? '<a href="' + a + '" target="' + c + '">' + a + "</a>" :'<a href="' + a + '">' + a + "</a>";
}))) :b;
}
};
} ]), angular.module("openshiftCommonUI").provider("NotificationsService", function() {
Expand Down

0 comments on commit b564ba0

Please sign in to comment.