Merge pull request #502 from ainuoyan/master

recaptcha is unavailable in China

Author: jrivard

.gitignore

@@ -26,3 +26,22 @@
 /webapp/src/main/webapp/public/resources/themes/idm
 /webapp/src/main/webapp/public/resources/themes/mdefault
 /webapp/src/main/webapp/public/resources/themes/mdefault44
+
+# VS Code Project Files
+.vscode/*
+.vscode/*
+!.vscode/settings.json
+!.vscode/tasks.json
+!.vscode/launch.json
+!.vscode/extensions.json
+
+**/.settings/
+*/.settings/
+**/*.classpath
+*/*.classpath
+**/*.factorypath
+*/*.factorypath
+**/*.project
+*/*.project
+
+

server/src/main/resources/password/pwm/AppProperty.properties

@@ -284,9 +284,9 @@ queue.syslog.maxCount=100000
 reporting.ldap.searchTimeoutMs=1800000
 reporting.ldap.searchThreads=8
 reporting.maxReportAgeSeconds=864000
-recaptcha.clientJsUrl=//www.google.com/recaptcha/api.js
-recaptcha.clientIframeUrl=//www.google.com/recaptcha/api/noscript
-recaptcha.validateUrl=https://www.google.com/recaptcha/api/siteverify
+recaptcha.clientJsUrl=//www.recaptcha.net/recaptcha/api.js
+recaptcha.clientIframeUrl=//www.recaptcha.net/recaptcha/api/noscript
+recaptcha.validateUrl=https://www.recaptcha.net/recaptcha/api/siteverify
 security.html.stripInlineJavascript=false
 security.http.forceRequestSequencing=false
 security.http.stripHeaderRegex=\\n|\\r|(?ism)%0A|%0D

server/src/main/resources/password/pwm/config/PwmSetting.xml

@@ -1615,7 +1615,7 @@
     </setting>
     <setting hidden="false" key="security.cspHeader" level="2">
         <default>
-            <value><![CDATA[default-src 'self'; object-src 'none'; img-src 'self' data:; style-src 'self' 'unsafe-inline'; script-src https://www.google.com/recaptcha/ https://www.gstatic.com/recaptcha/ 'self' 'unsafe-eval' 'nonce-%NONCE%'; frame-src https://www.google.com/recaptcha/ https://www.gstatic.com/recaptcha/; report-uri /sspr/public/command/cspReport]]></value>
+            <value><![CDATA[default-src 'self'; object-src 'none'; img-src 'self' data:; style-src 'self' 'unsafe-inline'; script-src https://www.recaptcha.net/recaptcha/ https://www.gstatic.cn/recaptcha/  https://www.gstatic.com/recaptcha/ https://www.google.com/recaptcha/ 'self' 'unsafe-eval' 'nonce-%NONCE%'; frame-src https://www.recaptcha.net/recaptcha/ https://www.gstatic.cn/recaptcha/ https://www.gstatic.com/recaptcha/ https://www.google.com/recaptcha/ ; report-uri /sspr/public/command/cspReport]]></value>
         </default>
     </setting>
     <setting hidden="false" key="email.adminAlert.toAddress" level="1">