Skip to content

Commit

Permalink
refactor: rename jans-ce-setup (#704)
Browse files Browse the repository at this point in the history
* ci: rename jans-ce-setup

* refactor: rename jans-ce-setup to jans-linux-setup

* fix: vm setup suse fixes (#705)

* fix: suse fixes

* refactor(admin-ui): remove admin-ui (ref: #691)

* fix: remove cb and spanner backend options for package

* refactor(ce-setup): ce-setup exclude jwt from config-cli

(cherry picked from commit 2f69a8a)

* ci: rename jans-vm-setup to jans-linux-setup

Co-authored-by: Mohammad Abudayyeh <47318409+moabu@users.noreply.github.com>
Co-authored-by: Mustafa Baser <mbaser@mail.com>
  • Loading branch information
3 people authored Jan 26, 2022
1 parent 2f69a8a commit d50da27
Show file tree
Hide file tree
Showing 290 changed files with 1,160 additions and 1,274 deletions.
4 changes: 2 additions & 2 deletions .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
Expand Up @@ -21,5 +21,5 @@
/jans-client-api/ @duttarnab @yuriyz
/jans-config-api/ @pujavs @yuriyz
/jans-cli/ @mbaser
/jans-ce-setup/ @mbaser @smansoft @yuriyz
/jans-ce-setup/static/scripts/admin_ui_plugin.py @mbaser @duttarnab
/jans-linux-setup/ @mbaser @smansoft @yuriyz
/jans-linux-setup/static/scripts/admin_ui_plugin.py @mbaser @duttarnab
4 changes: 2 additions & 2 deletions .github/workflows/central_code_quality_check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ jobs:
strategy:
fail-fast: false
matrix:
module: [jans-auth-server, jans-config-api, jans-core, jans-ce-setup, jans-cli, jans-client-api, jans-fido2, jans-notify, jans-orm, jans-scim, jans-eleven, jans-pycloudlib]
module: [jans-auth-server, jans-config-api, jans-core, jans-linux-setup, jans-cli, jans-client-api, jans-fido2, jans-notify, jans-orm, jans-scim, jans-eleven, jans-pycloudlib]
env:
JVM_PROJECTS: |
jans-auth-server
Expand All @@ -49,7 +49,7 @@ jobs:
jans-fido2
jans-eleven
NON_JVM_PROJECTS: |
jans-ce-setup
jans-linux-setup
jans-cli
jans-pycloudlib
Expand Down
114 changes: 0 additions & 114 deletions jans-ce-setup/static/auth/lib/duo_web.py

This file was deleted.

File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
2 changes: 1 addition & 1 deletion jans-ce-setup/install.py → jans-linux-setup/install.py
Original file line number Diff line number Diff line change
Expand Up @@ -362,7 +362,7 @@ def profile_setup():

print("Extracting jans-setup package")

extract_subdir(jans_zip_file, 'jans-ce-setup', setup_dir)
extract_subdir(jans_zip_file, 'jans-linux-setup', setup_dir)
extract_subdir(sqlalchemy_zip_file, 'lib/sqlalchemy', os.path.join(setup_dir, 'setup_app/pylib/sqlalchemy'))

extract_file(jans_zip_file, 'jans-config-api/docs/jans-config-api-swagger.yaml', os.path.join(setup_dir, 'setup_app/data'))
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,54 +1,54 @@
# oxAuth is available under the MIT License (2008). See http://opensource.org/licenses/MIT for full text.
# Copyright (c) 2021, Gluu
#
# Author: Yuriy Zabrovarnyy
#
#

from io.jans.model.custom.script.type.introspection import IntrospectionType
from java.lang import String
from io.jans.as.server.model.common import AuthorizationGrantList
from io.jans.service.cdi.util import CdiUtil
from io.jans.as.server.service import GrantService
from io.jans.as.model.common import TokenType
from io.jans.as.server.model.ldap import TokenEntity
from io.jans.as.server.service import SessionIdService

class Introspection(IntrospectionType):
def __init__(self, currentTimeMillis):
self.currentTimeMillis = currentTimeMillis

def init(self, customScript, configurationAttributes):
print "Introspection script (retain claims). Initializing ..."
print "Introspection script (retain claims). Initialized successfully"

return True

def destroy(self, configurationAttributes):
print "Introspection script (retain claims). Destroying ..."
print "Introspection script (retain claims). Destroyed successfully"
return True

def getApiVersion(self):
return 11

# Returns boolean, true - apply introspection method, false - ignore it.
# This method is called after introspection response is ready. This method can modify introspection response.
# Note :
# responseAsJsonObject - is org.codehaus.jettison.json.JSONObject, you can use any method to manipulate json
# context is reference of org.gluu.oxauth.service.external.context.ExternalIntrospectionContext (in https://github.com/GluuFederation/oxauth project, )
def modifyResponse(self, responseAsJsonObject, context):
print "modifyResponse invoked"

sessionIdService = CdiUtil.bean(SessionIdService)

if context.getTokenGrant().getSessionDn() is not None:
print "session id from context - %s" % context.getTokenGrant().getSessionDn()
sessionId = sessionIdService.getSessionByDn(context.getTokenGrant().getSessionDn()) # fetch from persistence
openbanking_intent_id = sessionId.getSessionAttributes().get("openbanking_intent_id")
print "openbanking_intent_id from session : "+openbanking_intent_id
responseAsJsonObject.accumulate("openbanking_intent_id", openbanking_intent_id)

return True

# oxAuth is available under the MIT License (2008). See http://opensource.org/licenses/MIT for full text.
# Copyright (c) 2021, Gluu
#
# Author: Yuriy Zabrovarnyy
#
#

from io.jans.model.custom.script.type.introspection import IntrospectionType
from java.lang import String
from io.jans.as.server.model.common import AuthorizationGrantList
from io.jans.service.cdi.util import CdiUtil
from io.jans.as.server.service import GrantService
from io.jans.as.model.common import TokenType
from io.jans.as.server.model.ldap import TokenEntity
from io.jans.as.server.service import SessionIdService

class Introspection(IntrospectionType):
def __init__(self, currentTimeMillis):
self.currentTimeMillis = currentTimeMillis

def init(self, customScript, configurationAttributes):
print "Introspection script (retain claims). Initializing ..."
print "Introspection script (retain claims). Initialized successfully"

return True

def destroy(self, configurationAttributes):
print "Introspection script (retain claims). Destroying ..."
print "Introspection script (retain claims). Destroyed successfully"
return True

def getApiVersion(self):
return 11

# Returns boolean, true - apply introspection method, false - ignore it.
# This method is called after introspection response is ready. This method can modify introspection response.
# Note :
# responseAsJsonObject - is org.codehaus.jettison.json.JSONObject, you can use any method to manipulate json
# context is reference of org.gluu.oxauth.service.external.context.ExternalIntrospectionContext (in https://github.com/GluuFederation/oxauth project, )
def modifyResponse(self, responseAsJsonObject, context):
print "modifyResponse invoked"

sessionIdService = CdiUtil.bean(SessionIdService)

if context.getTokenGrant().getSessionDn() is not None:
print "session id from context - %s" % context.getTokenGrant().getSessionDn()
sessionId = sessionIdService.getSessionByDn(context.getTokenGrant().getSessionDn()) # fetch from persistence
openbanking_intent_id = sessionId.getSessionAttributes().get("openbanking_intent_id")
print "openbanking_intent_id from session : "+openbanking_intent_id
responseAsJsonObject.accumulate("openbanking_intent_id", openbanking_intent_id)

return True


File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
{
"hotp":{
"keyLength":20,
"digits":6,
"lookAheadWindow":10
},
"totp":{
"keyLength":20,
"digits":6,
"timeStep":30,
"hmacShaAlgorithm": "sha1"
}
}
{
"hotp":{
"keyLength":20,
"digits":6,
"lookAheadWindow":10
},
"totp":{
"keyLength":20,
"digits":6,
"timeStep":30,
"hmacShaAlgorithm": "sha1"
}
}
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
{
"android":{
"jans":{
"enabled":true,
"access_key":"36WH2JiexBOoAIBP",
"secret_access_key":"ueqsU2Dc7m3r4HmLz4M79DpzzCNqTfek"
}
},
"ios":{
"jans":{
"enabled":true,
"access_key":"auONAdePWoYFBX6V",
"secret_access_key":"f050aW0nnihym0GwktWd7O15jGSQcoei"
}
},
"jans":{
"server_uri":"https://api.jans.io"
}
}
{
"android":{
"jans":{
"enabled":true,
"access_key":"36WH2JiexBOoAIBP",
"secret_access_key":"ueqsU2Dc7m3r4HmLz4M79DpzzCNqTfek"
}
},
"ios":{
"jans":{
"enabled":true,
"access_key":"auONAdePWoYFBX6V",
"secret_access_key":"f050aW0nnihym0GwktWd7O15jGSQcoei"
}
},
"jans":{
"server_uri":"https://api.jans.io"
}
}
File renamed without changes.
File renamed without changes.
File renamed without changes.
Loading

0 comments on commit d50da27

Please sign in to comment.