From 6ddef7bceb58093227f8d60e322d125e1f362e62 Mon Sep 17 00:00:00 2001
From: Roeland Jago Douma <roeland@famdouma.nl>
Date: Fri, 28 Sep 2018 12:53:45 +0200
Subject: [PATCH] Bump strengthify

Fixes #11033
For https://github.com/orgs/nextcloud/projects/18

Move to a stricter CSP safe strengthify

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
---
 core/vendor/strengthify/.bower.json           |  8 ++++----
 core/vendor/strengthify/jquery.strengthify.js | 18 ++++++++++--------
 core/vendor/strengthify/strengthify.css       |  2 +-
 3 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/core/vendor/strengthify/.bower.json b/core/vendor/strengthify/.bower.json
index de9904137e..5441c6d3f0 100644
--- a/core/vendor/strengthify/.bower.json
+++ b/core/vendor/strengthify/.bower.json
@@ -1,6 +1,6 @@
 {
   "name": "strengthify",
-  "version": "0.5.3",
+  "version": "0.5.4",
   "homepage": "https://github.com/MorrisJobke/strengthify",
   "authors": [
     "Eve Ragins <eve.ragins@eve-corp.com",
@@ -9,11 +9,11 @@
   "description": "Combine jQuery and zxcvbn to create a password strength meter.",
   "main": "jquery.strengthify.js",
   "license": "MIT",
-  "_release": "0.5.3",
+  "_release": "0.5.4",
   "_resolution": {
     "type": "version",
-    "tag": "0.5.3",
-    "commit": "a97e861762ccb17ce5f51d5c608b5d9e42732ae3"
+    "tag": "0.5.4",
+    "commit": "3d9759958558752d0c115774d2b0bc34fac7e31b"
   },
   "_source": "https://github.com/MorrisJobke/strengthify.git",
   "_target": "^0.5.3",
diff --git a/core/vendor/strengthify/jquery.strengthify.js b/core/vendor/strengthify/jquery.strengthify.js
index 204a0b33cc..6a78a7cba5 100644
--- a/core/vendor/strengthify/jquery.strengthify.js
+++ b/core/vendor/strengthify/jquery.strengthify.js
@@ -2,7 +2,7 @@
  * Strengthify - show the weakness of a password (uses zxcvbn for this)
  * https://github.com/MorrisJobke/strengthify
  *
- * Version: 0.5.2
+ * Version: 0.5.4
  * Author: Morris Jobke (github.com/MorrisJobke) - original
  *         Eve Ragins @ Eve Corp (github.com/eve-corp)
  *
@@ -90,6 +90,10 @@
                     '"progid:DXImageTransform.Microsoft.Alpha(Opacity=' + opacity * 100 + ')"'
                     );
 
+                if (options.onResult) {
+                    options.onResult(result);
+                }
+
                 // style strengthify bar
                 // possible scores: 0-4
                 switch (result.score) {
@@ -203,13 +207,11 @@
 
                 $elem.parent().on('scroll', drawSelf);
 
-                $.ajax({
-                    cache: true,
-                    url: options.zxcvbn
-                }).done(function(content) {
-                    eval(content);
-                    $elem.bind('keyup input change', drawSelf);
-                });
+                var script = document.createElement("script");
+                script.src = options.zxcvbn;
+                document.head.appendChild(script);
+
+                $elem.bind('keyup input change', drawSelf);
             };
 
             init.call(this);
diff --git a/core/vendor/strengthify/strengthify.css b/core/vendor/strengthify/strengthify.css
index bacdd541ea..f94e9ccc9b 100644
--- a/core/vendor/strengthify/strengthify.css
+++ b/core/vendor/strengthify/strengthify.css
@@ -1,7 +1,7 @@
 /**
  * Strengthify - show the weakness of a password (uses zxcvbn for this)
  * https://github.com/MorrisJobke/strengthify
- * Version: 0.5.2
+ * Version: 0.5.4
  * License: The MIT License (MIT)
  * Copyright (c) 2013-2016 Morris Jobke <morris.jobke@gmail.com>
  */