Repository: incubator-ranger Updated Branches: refs/heads/ranger-0.5 eb4c5e2c4 -> 132f3f236
RANGER-677 : Ranger Admin fails to render policies referring to groups that contain . (dot) in name Project: http://git-wip-us.apache.org/repos/asf/incubator-ranger/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ranger/commit/132f3f23 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ranger/tree/132f3f23 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ranger/diff/132f3f23 Branch: refs/heads/ranger-0.5 Commit: 132f3f2365d1f1629e218d078272dd3acd63bd8f Parents: eb4c5e2 Author: Gautam Borad <[email protected]> Authored: Tue Oct 6 12:36:29 2015 +0530 Committer: Gautam Borad <[email protected]> Committed: Thu Oct 8 18:25:21 2015 +0530 ---------------------------------------------------------------------- .../src/main/java/org/apache/ranger/common/StringUtil.java | 1 - .../src/main/java/org/apache/ranger/rest/XUserREST.java | 6 ++---- security-admin/src/main/webapp/META-INF/context.xml | 4 ++-- security-admin/src/main/webapp/WEB-INF/web.xml | 5 ++++- 4 files changed, 8 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/132f3f23/security-admin/src/main/java/org/apache/ranger/common/StringUtil.java ---------------------------------------------------------------------- diff --git a/security-admin/src/main/java/org/apache/ranger/common/StringUtil.java b/security-admin/src/main/java/org/apache/ranger/common/StringUtil.java index 1eaff1a..f5990b4 100644 --- a/security-admin/src/main/java/org/apache/ranger/common/StringUtil.java +++ b/security-admin/src/main/java/org/apache/ranger/common/StringUtil.java @@ -36,7 +36,6 @@ public class StringUtil implements Serializable { static final public String VALIDATION_NAME = "[\\w\\ \\-\\']*"; static final public String VALIDATION_TEXT = "[a-zA-Z0-9\\ \"!@#$%^&*()-_=+;:'"|~`<>?/{}\\.\\,\\-\\?<>]*"; - // Only for Student loginId static final public String VALIDATION_LOGINID = "[a-z,A-Z][\\w\\-\\_]*[a-z,A-Z,0-9]"; static final public String VALIDATION_ALPHA = "[a-z,A-Z]*"; http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/132f3f23/security-admin/src/main/java/org/apache/ranger/rest/XUserREST.java ---------------------------------------------------------------------- diff --git a/security-admin/src/main/java/org/apache/ranger/rest/XUserREST.java b/security-admin/src/main/java/org/apache/ranger/rest/XUserREST.java index 0b58c91..b7884eb 100644 --- a/security-admin/src/main/java/org/apache/ranger/rest/XUserREST.java +++ b/security-admin/src/main/java/org/apache/ranger/rest/XUserREST.java @@ -225,11 +225,9 @@ public class XUserREST { public VXGroupList searchXGroups(@Context HttpServletRequest request) { SearchCriteria searchCriteria = searchUtil.extractCommonCriterias( request, xGroupService.sortFields); - searchUtil.extractString(request, searchCriteria, "name", "group name", - StringUtil.VALIDATION_NAME); + searchUtil.extractString(request, searchCriteria, "name", "group name", null); searchUtil.extractInt(request, searchCriteria, "isVisible", "Group Visibility"); - searchUtil.extractString(request, searchCriteria, "groupSource", "group source", - StringUtil.VALIDATION_NAME); + searchUtil.extractString(request, searchCriteria, "groupSource", "group source", null); return xUserMgr.searchXGroups(searchCriteria); } http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/132f3f23/security-admin/src/main/webapp/META-INF/context.xml ---------------------------------------------------------------------- diff --git a/security-admin/src/main/webapp/META-INF/context.xml b/security-admin/src/main/webapp/META-INF/context.xml index 7a573f6..9c7ea95 100644 --- a/security-admin/src/main/webapp/META-INF/context.xml +++ b/security-admin/src/main/webapp/META-INF/context.xml @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. --> -<Context allowLinking="true"> +<Context allowLinking="true" useHttpOnly="true"> <Loader className="org.apache.catalina.loader.VirtualWebappLoader" virtualClasspath="webapp/WEB-INF/classes/conf;webapp/WEB-INF/classes/lib/*" /> -</Context> \ No newline at end of file +</Context> http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/132f3f23/security-admin/src/main/webapp/WEB-INF/web.xml ---------------------------------------------------------------------- diff --git a/security-admin/src/main/webapp/WEB-INF/web.xml b/security-admin/src/main/webapp/WEB-INF/web.xml index cbd5724..0725633 100644 --- a/security-admin/src/main/webapp/WEB-INF/web.xml +++ b/security-admin/src/main/webapp/WEB-INF/web.xml @@ -79,6 +79,9 @@ <session-config> <session-timeout>60</session-timeout> <tracking-mode>COOKIE</tracking-mode> + <cookie-config> + <http-only>true</http-only> + </cookie-config> </session-config> <error-page> <error-code>500</error-code> @@ -88,4 +91,4 @@ <error-code>404</error-code> <location>/public/error404.jsp</location> </error-page> -</web-app> \ No newline at end of file +</web-app>
