LiRuochen_WorkFlow/MaxKey
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

sso.maxkey.top

Browse Source
This commit is contained in:
shimingxy
2020-06-24 01:09:58 +08:00
parent 4396ae5cda
commit f9a48a4e8e
6 changed files with 14 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
maxkey-client-sdk/src/main/java/org/maxkey/client/oauth/builder/api/MaxkeyApi10a.java
View File

@@ -4,7 +4,7 @@ import org.maxkey.client.oauth.model.Token;
public class MaxkeyApi10a extends DefaultApi10a public class MaxkeyApi10a extends DefaultApi10a
{ {
private static final String DEFAULT_WEB_URL = "https://sso.maxkey.org/maxkey"; private static final String DEFAULT_WEB_URL = "https://sso.maxkey.top/maxkey";
private static final String AUTHORIZATION_URL = DEFAULT_WEB_URL+"/oauth/v10a/authz?oauth_token=%s"; private static final String AUTHORIZATION_URL = DEFAULT_WEB_URL+"/oauth/v10a/authz?oauth_token=%s";
public MaxkeyApi10a() { public MaxkeyApi10a() {

2
maxkey-client-sdk/src/main/java/org/maxkey/client/oauth/builder/api/MaxkeyApi20.java
View File

@@ -9,7 +9,7 @@ import org.maxkey.client.utils.Preconditions;
public class MaxkeyApi20 extends DefaultApi20 { public class MaxkeyApi20 extends DefaultApi20 {
//approval_prompt:force or auto //approval_prompt:force or auto
private static final String DEFAULT_WEB_URL = "https://sso.maxkey.org/maxkey"; private static final String DEFAULT_WEB_URL = "https://sso.maxkey.top/maxkey";
private static final String AUTHORIZATION_URL = "%s/oauth/v20/authorize?client_id=%s&response_type=code&redirect_uri=%s&approval_prompt=auto"; private static final String AUTHORIZATION_URL = "%s/oauth/v20/authorize?client_id=%s&response_type=code&redirect_uri=%s&approval_prompt=auto";

8
maxkey-web-manage/src/main/resources/maxkey.properties
View File

@@ -2,7 +2,7 @@
# MaxKey Management # MaxKey Management
############################################################################ ############################################################################
# domain name configuration # domain name configuration
config.server.domain=maxkey.org config.server.domain=maxkey.top
config.server.domain.sub=sso.${config.server.domain} config.server.domain.sub=sso.${config.server.domain}
config.server.name=http://${config.server.domain.sub} config.server.name=http://${config.server.domain.sub}
config.server.prefix.uri=${config.server.name}:9521/maxkey-mgt config.server.prefix.uri=${config.server.name}:9521/maxkey-mgt
@@ -50,10 +50,10 @@ config.saml.v20.idp.keystore.password=maxkey
config.saml.v20.idp.keystore.private.key.password=maxkey config.saml.v20.idp.keystore.private.key.password=maxkey
config.saml.v20.idp.keystore=classpath\:config/samlServerKeystore.jks config.saml.v20.idp.keystore=classpath\:config/samlServerKeystore.jks
#keystore id for sec #keystore id for sec
config.saml.v20.idp.issuing.entity.id=maxkey.org config.saml.v20.idp.issuing.entity.id=maxkey.top
config.saml.v20.idp.issuer=https://sso.maxkey.org/maxkey/saml config.saml.v20.idp.issuer=https://sso.maxkey.top/maxkey/saml
config.saml.v20.idp.receiver.endpoint=https\://sso.maxkey.org/ config.saml.v20.idp.receiver.endpoint=https\://sso.maxkey.top/
#saml sp keystore #saml sp keystore
config.saml.v20.sp.keystore.password=maxkey config.saml.v20.sp.keystore.password=maxkey

1
maxkey-web-manage/src/main/resources/templates/views/apps/saml20/appUpdate.ftl
View File

@@ -212,7 +212,6 @@ $(function(){
</tr> </tr>
<tr> <tr>
<td colspan =4> <td colspan =4>
<input class="button" id="status" type="hidden" name="status" value="1"/>
<input class="button btn btn-primary mr-3" id="submitBtn" type="submit" value="<@locale code="button.text.save" />"/> <input class="button btn btn-primary mr-3" id="submitBtn" type="submit" value="<@locale code="button.text.save" />"/>
<input class="button btn btn-secondary mr-3" id="backBtn" type="button" value="<@locale code="button.text.cancel" />"/> <input class="button btn btn-secondary mr-3" id="backBtn" type="button" value="<@locale code="button.text.cancel" />"/>
</td> </td>

1
maxkey-web-manage/src/main/resources/templates/views/apps/tokenbased/appUpdate.ftl
View File

@@ -148,7 +148,6 @@ $(function(){
</tr> </tr>
<tr> <tr>
<td colspan =4> <td colspan =4>
<input class="button" id="status" type="hidden" name="status" value="1"/>
<input class="button btn btn-primary mr-3" id="submitBtn" type="submit" value="<@locale code="button.text.save" />"/> <input class="button btn btn-primary mr-3" id="submitBtn" type="submit" value="<@locale code="button.text.save" />"/>
<input class="button btn btn-secondary mr-3" id="backBtn" type="button" value="<@locale code="button.text.cancel" />"/> <input class="button btn btn-secondary mr-3" id="backBtn" type="button" value="<@locale code="button.text.cancel" />"/>
</td> </td>

16
maxkey-web-maxkey/src/main/resources/maxkey.properties
View File

@@ -2,7 +2,7 @@
# MaxKey # MaxKey
############################################################################ ############################################################################
# domain name configuration # domain name configuration
config.server.domain=maxkey.org config.server.domain=maxkey.top
config.server.domain.sub=sso.${config.server.domain} config.server.domain.sub=sso.${config.server.domain}
config.server.name=http://${config.server.domain.sub} config.server.name=http://${config.server.domain.sub}
config.server.prefix.uri=${config.server.name}/maxkey config.server.prefix.uri=${config.server.name}/maxkey
@@ -77,7 +77,7 @@ config.support.kerberos.default.fulluserdomain=MAXKEY.ORG
#last 8Bit crypto for Kerberos web Authentication #last 8Bit crypto for Kerberos web Authentication
config.support.kerberos.default.crypto=846KZSzYq56M6d5o config.support.kerberos.default.crypto=846KZSzYq56M6d5o
#Kerberos Authentication server RUL #Kerberos Authentication server RUL
config.support.kerberos.default.redirecturi=http://sso.maxkey.org/kerberos/authn/ config.support.kerberos.default.redirecturi=http://sso.maxkey.top/kerberos/authn/
############################################################################ ############################################################################
# HTTPHEADER Login configuration # HTTPHEADER Login configuration
############################################################################ ############################################################################
@@ -103,14 +103,14 @@ config.support.basic.enable=false
#signingCertificate: ADFS's signing certificate used to validate the token/assertions issued by ADFS. #signingCertificate: ADFS's signing certificate used to validate the token/assertions issued by ADFS.
############################################################################ ############################################################################
config.support.wsfederation.identifier=http://adfs.maxkey.org/adfs/services/trust config.support.wsfederation.identifier=http://adfs.maxkey.top/adfs/services/trust
config.support.wsfederation.url=https://adfs.maxkey.org/adfs/ls/ config.support.wsfederation.url=https://adfs.maxkey.top/adfs/ls/
config.support.wsfederation.principal=upn config.support.wsfederation.principal=upn
config.support.wsfederation.relyingParty=urn:federation:connsec config.support.wsfederation.relyingParty=urn:federation:connsec
config.support.wsfederation.signingCertificate=adfs-signing.crt config.support.wsfederation.signingCertificate=adfs-signing.crt
config.support.wsfederation.tolerance=10000 config.support.wsfederation.tolerance=10000
config.support.wsfederation.upn.suffix=maxkey.org config.support.wsfederation.upn.suffix=maxkey.org
config.support.wsfederation.logoutUrl=https://adfs.maxkey.org/adfs/ls/?wa=wsignout1.0 config.support.wsfederation.logoutUrl=https://adfs.maxkey.top/adfs/ls/?wa=wsignout1.0
############################################################################# #############################################################################
############################################################################# #############################################################################
@@ -135,10 +135,10 @@ config.saml.v20.idp.keystore.password=maxkey
config.saml.v20.idp.keystore.private.key.password=maxkey config.saml.v20.idp.keystore.private.key.password=maxkey
config.saml.v20.idp.keystore=classpath\:config/samlServerKeystore.jks config.saml.v20.idp.keystore=classpath\:config/samlServerKeystore.jks
#keystore id for sec #keystore id for sec
config.saml.v20.idp.issuing.entity.id=maxkey.org config.saml.v20.idp.issuing.entity.id=maxkey.top
config.saml.v20.idp.issuer=https://sso.maxkey.org/maxkey/saml config.saml.v20.idp.issuer=https://sso.maxkey.top/maxkey/saml
config.saml.v20.idp.receiver.endpoint=https\://sso.maxkey.org/ config.saml.v20.idp.receiver.endpoint=https\://sso.maxkey.top/
#saml sp keystore #saml sp keystore
config.saml.v20.sp.keystore.password=maxkey config.saml.v20.sp.keystore.password=maxkey