You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@usergrid.apache.org by sn...@apache.org on 2016/10/20 20:45:29 UTC
[1/2] usergrid git commit: Add missing bad_confirmation_token.jsp
Repository: usergrid
Updated Branches:
refs/heads/master 48d306f45 -> cb0dc69da
Add missing bad_confirmation_token.jsp
Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/1abafe72
Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/1abafe72
Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/1abafe72
Branch: refs/heads/master
Commit: 1abafe72be217bdc827f6aa386aae93e81260f33
Parents: 9c5f599
Author: Dave Johnson <sn...@apache.org>
Authored: Thu Oct 20 16:43:30 2016 -0400
Committer: Dave Johnson <sn...@apache.org>
Committed: Thu Oct 20 16:43:30 2016 -0400
----------------------------------------------------------------------
.../UserResource/bad_confirmation_token.jsp | 33 ++++++++++++++++++++
1 file changed, 33 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/usergrid/blob/1abafe72/stack/rest/src/main/webapp/WEB-INF/jsp/org/apache/usergrid/rest/management/users/UserResource/bad_confirmation_token.jsp
----------------------------------------------------------------------
diff --git a/stack/rest/src/main/webapp/WEB-INF/jsp/org/apache/usergrid/rest/management/users/UserResource/bad_confirmation_token.jsp b/stack/rest/src/main/webapp/WEB-INF/jsp/org/apache/usergrid/rest/management/users/UserResource/bad_confirmation_token.jsp
new file mode 100644
index 0000000..ecd74b8
--- /dev/null
+++ b/stack/rest/src/main/webapp/WEB-INF/jsp/org/apache/usergrid/rest/management/users/UserResource/bad_confirmation_token.jsp
@@ -0,0 +1,33 @@
+<%@ page language="java" contentType="text/html; charset=ISO-8859-1"
+ pageEncoding="ISO-8859-1"%>
+<%@ page import="org.apache.usergrid.rest.AbstractContextResource"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
+<!--
+Licensed to the Apache Software Foundation (ASF) under one or more
+contributor license agreements. See the NOTICE file distributed with
+this work for additional information regarding copyright ownership.
+The ASF licenses this file to You under the Apache License, Version 2.0
+(the "License"); you may not use this file except in compliance with
+the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+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 PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<head>
+ <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+ <title>Error</title>
+ <link rel="stylesheet" type="text/css" href="/css/styles.css" />
+</head>
+<body>
+
+ <p>Confirmation token invalid or expired</p>
+
+</body>
+</html>
[2/2] usergrid git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/usergrid
Posted by sn...@apache.org.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/usergrid
* 'master' of https://git-wip-us.apache.org/repos/asf/usergrid:
Ensure the admin invited to org email is sent even when external SSO is enabled.
Configurable Password Policy and 5 supporting JUnit tests.
Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/cb0dc69d
Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/cb0dc69d
Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/cb0dc69d
Branch: refs/heads/master
Commit: cb0dc69da29f578c06fd5a7bea7da302756ffd56
Parents: 1abafe7 48d306f
Author: Dave Johnson <sn...@apache.org>
Authored: Thu Oct 20 16:45:26 2016 -0400
Committer: Dave Johnson <sn...@apache.org>
Committed: Thu Oct 20 16:45:26 2016 -0400
----------------------------------------------------------------------
.../exceptions/AbstractExceptionMapper.java | 2 +-
.../PasswordPolicyViolationExceptionMapper.java | 48 ++++++
.../collection/users/PermissionsResourceIT.java | 4 +-
.../collection/users/UserResourceIT.java | 38 ++++-
.../usergrid/rest/management/AdminUsersIT.java | 51 ++++++
.../rest/management/ManagementResourceIT.java | 4 +-
.../rest/management/RegistrationIT.java | 6 +-
.../cassandra/ManagementServiceImpl.java | 77 ++++++---
.../usergrid/security/PasswordPolicy.java | 53 ++++++
.../usergrid/security/PasswordPolicyFig.java | 79 +++++++++
.../usergrid/security/PasswordPolicyImpl.java | 156 ++++++++++++++++++
.../PasswordPolicyViolationException.java | 46 ++++++
.../services/guice/ServiceModuleImpl.java | 8 +
.../usergrid/security/PasswordPolicyTest.java | 47 ++++++
.../security/PasswordPolicyTestFig.java | 161 +++++++++++++++++++
15 files changed, 751 insertions(+), 29 deletions(-)
----------------------------------------------------------------------