zhouxy108/wisemapping-open-source
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove openid

Browse Source
This commit is contained in:
Paulo Gustavo Veiga
2020-11-28 15:27:46 -08:00
parent cade40e1a3
commit 39ff095df7
16 changed files with 100 additions and 612 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
wise-webapp/src/main/webapp/WEB-INF/app.properties
View File

@@ -138,9 +138,6 @@ security.ldap.auth.attribute=mail
security.ldap.lastName.attribute=sn
security.ldap.firstName.attribute=givenName
# Enable OpenId Authentication.
security.openid.enabled=false
# REST Documentation
#
# This properties are used for REST API Documentation( http://localhost:8080/wisemapping/doc/rest/index.html)
@@ -149,6 +146,14 @@ documentation.services.basePath=http://localhost:8080/service
documentation.services.version=3.0.1
# OAuth2 Security
#spring.security.oauth2.client.registration.google.client-id=<your client id>
#spring.security.oauth2.client.registration.google.client-secret=<your client secret>
#spring.security.oauth2.client.registration.facebook.client-id=<your client id>
#spring.security.oauth2.client.registration.facebook.client-secret=<your client secret>

8
wise-webapp/src/main/webapp/WEB-INF/classes/log4j.properties
View File

@@ -1,6 +1,6 @@
log4j.rootLogger=WARN, stdout, R
log4j.logger.com.wisemapping=INFO,stdout,R
log4j.logger.org.springframework=INFO,stdout,R
log4j.rootLogger=TRACE, stdout, R
log4j.logger.com.wisemapping=TRACE,stdout,R
log4j.logger.org.springframework=TRACE,stdout,R
log4j.logger.org.hibernate.engine.internal.StatefulPersistenceContext=ERROR,stdout,R
# Stdout logger <20>
@@ -9,7 +9,7 @@ log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
log4j.appender.stdout.layout.ConversionPattern=%d %p %c - %m%n
# File Writter Logger <20>
# File Writer Logger <20>
log4j.appender.R=org.apache.log4j.RollingFileAppender
log4j.appender.R.File=wisemapping.log

19
wise-webapp/src/main/webapp/WEB-INF/defs/definitions.xml
View File

@@ -1,6 +1,6 @@
<!DOCTYPE tiles-definitions PUBLIC
"-//Apache Software Foundation//DTD Tiles Configuration 2.1//EN"
"http://tiles.apache.org/dtds/tiles-config_2_1.dtd">
"http://tiles.apache.org/dtds/tiles-config_3_0.dtd">
<tiles-definitions>
@@ -37,16 +37,6 @@
<definition name="iframeWrapper" template="/jsp/iframeWrapper.jsp"/>
<!-- Error Pages -->
<definition name="GCFPluginRequired" extends="pageTemplate">
<put-attribute name="body" value="/jsp/GCFPluginRequired.jsp"/>
<put-attribute name="title" value="INSTALL_CFG"/>
</definition>
<definition name="GCFInstall" extends="pageTemplate">
<put-attribute name="body" value="/jsp/GCFInstall.jsp"/>
<put-attribute name="title" value="INSTALL_CFG"/>
</definition>
<definition name="unexpectedError" extends="errorTemplate">
<put-attribute name="title" value="UNEXPECTED_ERROR"/>
<put-attribute name="details" value="UNEXPECTED_ERROR_DETAILS"/>
@@ -68,19 +58,12 @@
<put-attribute name="body" value="/jsp/userForgotPasswordSuccess.jsp"/>
</definition>
<!-- Main Pages -->
<definition name="login" extends="pageTemplate">
<put-attribute name="title" value="LOGIN"/>
<put-attribute name="body" value="/jsp/login.jsp"/>
<put-attribute name="removeSignin" value="true"/>
</definition>
<definition name="loginopenid" extends="pageTemplate">
<put-attribute name="title" value="LOGIN"/>
<put-attribute name="body" value="/jsp/loginOpenId.jsp"/>
<put-attribute name="removeSignin" value="true"/>
</definition>
<definition name="termsOfUse" extends="pageTemplate">
<put-attribute name="title" value="TERM_OF_USE"/>
<put-attribute name="body" value="/jsp/termsOfUse.jsp"/>

27
wise-webapp/src/main/webapp/WEB-INF/wisemapping-security.xml
View File

@@ -15,7 +15,6 @@
<sec:http pattern="/favicon.ico" security="none"/>
<sec:http pattern="/c/login" security="none"/>
<sec:http pattern="/c/loginopenid" security="none"/>
<sec:http pattern="/c/user/registration" security="none"/>
<sec:http pattern="/c/user/resetPassword" security="none"/>
<sec:http pattern="/c/home" security="none"/>
@@ -23,7 +22,6 @@
<sec:http pattern="/c/maps/*/embed" security="none"/>
<sec:http pattern="/c/maps/*/try" security="none"/>
<sec:http pattern="/c/maps/*/public" security="none"/>
<sec:http pattern="/c/GCFInstall" security="none"/>
<sec:http pattern="/c/restful/maps/*/document/xml-pub" security="none"/>
<sec:http pattern="/c/publicview.htm" security="none"/>
@@ -58,31 +56,6 @@
authentication-failure-url="/c/login?login_error=2"
login-processing-url="/c/perform-login"/>
<sec:openid-login user-service-ref="userDetailsService"
authentication-failure-url="/c/login.jsp?login_error=true"
login-processing-url="/c/j_spring_openid_security_check">
<sec:attribute-exchange identifier-match="https://www.google.com/.*">
<sec:openid-attribute name="email" type="http://axschema.org/contact/email" required="true" count="1"/>
<sec:openid-attribute name="firstname" type="http://axschema.org/namePerson/first" required="true"/>
<sec:openid-attribute name="lastname" type="http://axschema.org/namePerson/last" required="true"/>
</sec:attribute-exchange>
<sec:attribute-exchange identifier-match=".*yahoo.com.*">
<sec:openid-attribute name="email" type="http://axschema.org/contact/email" required="true"/>
<sec:openid-attribute name="fullname" type="http://axschema.org/namePerson" required="true"/>
</sec:attribute-exchange>
<sec:attribute-exchange identifier-match=".*yahoo.com.*">
<sec:openid-attribute name="email" type="http://axschema.org/contact/email" required="true"/>
<sec:openid-attribute name="fullname" type="http://axschema.org/namePerson" required="true"/>
</sec:attribute-exchange>
<sec:attribute-exchange identifier-match=".*myopenid.com.*">
<sec:openid-attribute name="email" type="http://schema.openid.net/contact/email" required="true"/>
<sec:openid-attribute name="fullname" type="http://schema.openid.net/namePerson" required="true"/>
</sec:attribute-exchange>
</sec:openid-login>
<sec:remember-me key="wisemapping-hashed-key"/>
<sec:logout logout-url="/c/logout" invalidate-session="true" logout-success-url="/c/login"/>
</sec:http>