Skip to content

Commit

Permalink
Merge from 4.3.0 (#2093)
Browse files Browse the repository at this point in the history
* Version 4.2.0.Final

* Version 4.2.1.Final

* Remove unencrypted redis password from database

* reset password when Secret question and Secret Answer are active. #2001

* Not able to delete claims redirect uri for any client #2002

* Use same resource messages varible name in oxAuth and oxTrust

* Remove temporary file

* Add .metadata to ingore list

* Fix i18n messages issue

* Remove old dependencies

* Fix Some UI issues

* Add health-check controller to oxtrust-server

* buttons in json configuration ? #2003

* Device authz grant type supported and configuration manage. GluuFederation/oxAuth#141

* Remove old dependency

* Store issued tokens count metrics #1436

* Use libs versions defined in bom file

* Changes in this commit:
   * Re-introduced oxtrust-api into oxTrust

* oxtrust : added dynamicRegistrationAllowedPasswordGrantScopes to oxauth conf

GluuFederation/oxAuth#1130

* oxtrust : added description for dynamicRegistrationAllowedPasswordGrantScopes

GluuFederation/oxAuth#1130

(cherry picked from commit 1e71ea5)

* Change javax.faces with jakarta.faces

* Injection: Cross-Site Scripting #2012

* Injection: Cross-Site Scripting #2012

* oxtrust : added new software statement related configuration properties to UI.

GluuFederation/oxAuth#1444

(cherry picked from commit d32feac)

* oxtrust : corrected software statement related configuration properties on UI.

GluuFederation/oxAuth#1444

(cherry picked from commit d32feac)

* Fix autocomplete issues, update bootsfaces to latest

* Initiate user logout upon successfull password reset

* add spacer

* Fix security question field on forgot password reset form

* Change label / values for Scope visibility #2015

* (4.2.1) oxtrust : added description of refreshTokenExtendLifetimeOnRotation configuration property

GluuFederation/oxAuth#1449

(cherry picked from commit bf86387)

* Visual issues on OIDC client advanced settings page #2018

* U2F enrollments not shown in User's Authentication Methods panel #2017

* Fix issues after Richfaces version changed

* Fix popup issue after richfaces upgrade

* UI fixes

* Password reset functionality is not working when security Question and security answer is entered. #2019

* Password reset functionality is not working when security Question and security answer is entered. #2019

* oxtrust : forbid fragment in redirect_uri

#2020

* JAXB-API implementation error #2005

* Convert trust contact from xml to json

* Forgot password functionality not working with captcha #2022

* fixed scopes inventory

* Disable browser's autocomplete for password fields

* gluu-release-attributes-post-processor

* CR copy binary attributes to local LDAP as base64 string #2025

* Remove CustomScriptService

* Remove CustomScriptService

* Use CustomScriptManager instead of ScriptService

* Fix compilation issue

* Use CustomScriptService

* Add U2F checkU2fAttestations option

* Fix search person by uid in person add action

* Fix search user by e-mail and uniqueness check

* Add checkU2fAttestations Fido2 property

* Fix search user by uid when uid is case sensetive

* Fix search person by uid in person add action

* Revert "Fix search person by uid in person add action"

This reverts commit c964095.

* Fix search person by uid in person add action

* Version 4.2.1.Final

* Saml Configured relay party : assertionlifetime value box is so small its value cannot be read . #2026

* Use latest 5.4.x hibernate validator

* Improve health check

* 503-fix

* Error Viewing InCommon Metadata #2029

* unverified-rp fix

* double nameid fix

* Re-try to download UMA metadata

* Add ability to specify oxauth address instead of calling FQDN #2032

* Branch for 4.2.2

* Version 4.2.2-SNAPSHOT

* oxTrust should use acr level to check acr instead of acr_name #2033

* oxTrust should use acr level to check acr instead of acr_name #2033

* Fix possibles memory leak

* Remove static fields usage to improve memory usage

* Move some noisy log lines to debug/trace

* Prevent registration of the attribute with the same name #2040

* Prevent registration of the attribute with the same name #2040

* 7 day statistics on home screen has strange behavior

* (4.2.2) oxtrust : added discoveryCacheLifetimeInMinutes to GUI

GluuFederation/oxAuth#1487
(cherry picked from commit f415f14)

* On oxtrust passport provider, the automatically generated callback url is invalid when using containers #2041

* Fix compilation error

* Fix missing parent metric branch  bug

* Fix missing parent metric branch  bug

* (4.2.2) oxtrust : added keySelectionStrategy to GUI

GluuFederation/oxAuth#1494

* (4.2.2) oxtrust : set format=select

GluuFederation/oxAuth#1494

* Add flag field, see GluuFederation/oxAuth#1499

* Fix compilation issue

* Remove sector_identifier_uri menu with dialogs and provide ability #2044

* Remove sector_identifier_uri menu with dialogs and provide ability to enter it as text with automatic population of redirect_uris #2044

* Passport Config: field mapping dropdown #2027

* Passport Config: field mapping dropdown #2027

* Passport Config: field mapping dropdown #2027

* (4.2.2) oxtrust : added subjectIdentifierBasedOnWholeUriBackwardCompatibility and sectorIdentifierCacheLifetimeInMinutes configuration properties

GluuFederation/oxAuth#1503

* (4.2.2) oxtrust : added REVOKE_TOKEN custom script type

GluuFederation/oxAuth#1502

* Don't stop on unsuccessfull BC installation

* Use oxAuth configuration to check if application should render login
graph on home page #2045

* Fix method to update log level oxAuth #204

* Fix OIDC error

* Passport Config: field mapping dropdown #2027

* Missing information on server status view #2047

* The request is missing a required parameter error obtained in flow 3 #2046

* Version 4.2.2.Final

* Use MetricService to prepare base branches

* 4.2.2-SNAPSHOT -> 4.2.2.Final

* Version 4.2.3-SNAPSHOT

* Fix OIDC error

* Passport Config: field mapping dropdown #2027

* The request is missing a required parameter error obtained in flow 3 #2046

* (4.2.3) oxtrust : Added stat related configurations to UI.

GluuFederation/oxAuth#1512

* Remove swagger file from oxTrust repo

* Remove swagger file from oxTrust repo

* Version 4.2.3.Final

* Version 4.3.0.Final

* Use documentStoreService instead of local file system to load metadata
file

* New interceptions script to modify id_token oxAuth #1523

* oxtrust: added keyAlgsAllowedForGeneration configuration property.

GluuFederation/oxAuth#1525

* Backport: Added cibaEnabled flag in the configuration.
GluuFederation/oxAuth#1404

* Add defaults passport strategies

* feat(oxtrust): design configuration for openid-client new passport provider strategy #2052

* feat(oxtrust): design configuration for openid-client new passport provider strategy #2052

* fix(oxtrust): remove sector identifier pages from the code #2057

* fix(oxtrust): support custom app schema and appschema #2057

* fix(oxtrust): add pagination for search feature against a big enough userbase #2061

* fix(oxtrust): add pagination for search feature against a big enough userbase #2061

* fix(oxtrust): add pagination for search feature against a big enough userbase #2061

* fix(oxtrust): add pagination for search feature against a big enough userbase #2061

* fix(oxtrust): add pagination for search feature against a big enough userbase #2061

* feat: move ORM to oxOrm

* feat: update to conform latest ORM

* feat: update to conform ORM

* feat: update to conform ORM

* feat: update to conform ORM

* fix: update to conform new API

* fix: update to conform new API

* fix: compilation fixes

* feat: add SQL/Spanner support

* feat: update models

* fix: cache Refresh: Don't print ldap password in log #2055

* feat: merge ORM from Jans

* feat: merge ORM from Jans

* feat: update to conform new API

* fix: fix search when DB is table based

* fix: remove deprecated attributes

* fix: remove unused attribute

* feat: sync gluuOxtrustStat with bean

* fix: missing oxAuth dynamic configuration after save #2067

* fix: update cleaner job to use more effective RDBS methods #2066

* fix: missing oxAuth dynamic configuration after save #2067

* fix: don't update GluuConfiguration bean attributes in get method #2065

* feat: add new ORM dependecies

* fix: remove userPassword from client

* fix: remove userPassword from client

* fix: don't attempt ot create branches

* feat: don't use lower case in authenticate if DB is Spanner

* feat(oxtrust): setting custom acr-value for idp-initiated flow #2051

* feat(oxtrust): enable custom validation checked by default (incorrectly) #2070

* feat(oxtrust): fido device service log for new registered user with scim should be in warn log #2068

* feat(oxtrust): Rremove 'generate sp metadata' feature #2043

* feat(oxtrust): add person form nrashes with new objectclass #2069

* Fix(oxTrust): saml nameid configuration is not working in cloud edition #2073

* Fix(oxTrust): saml nameid configuration is not working in cloud edition #2073

* feat: show JCA document store password properly

* feat: show JCA document store password properly

* Fix(oxTrust): saml nameid configuration is not working in cloud edition #2073

* Fix(oxTrust):  first uma rpt token after starting up #2060

* Fix(oxTrust): saml nameid configuration is not working in cloud edition #2073

* fix(oxtrust): saml nameid configuration is not working in cloud edition #2073

* fix(oxtrust): saml nameid configuration is not working in cloud edition #2073

* fix(oxtrust): fill correct provider options as per type in passport provider configuration #2074

* fix(oxtrust): email attribute validation Not working on view profile section. #2054

* feat(admin-ui): add option to show only enables or disabled scripts

* chore: remove joda lib usage

* feat(oxtrust): update morris.js library to latest #2078

* feat(oxtrust): update morris.js library to latest #2078

* fix: include postAuthenticationFlows for relying-party shibboleth config

* feat(oxtrust): fill correct provider options as per type in passport provider configuration #2074

* feat(oxtrust): adding extra libraries created wrong classpath in oxauth.xml #2077

* feat(oxtrust): adding extra libraries created wrong classpath in oxauth.xml #2077

* feat(oxtrust): cache refresh not working on 4.3.0 version. #2072

* fix(oxTrust): oops error on clicking Other custom Scripts #2081

* feat: update libs

* feat(oxtrust): password reset success completion redirection #2082

* fix: add shibboleth transcoding rules generation

Added code to generate Shibboleth 4 style transcoding rules
which are useful in the resolution of issue #74 in oxShibboleth

* fix: minor code style fixes and SAML1 references removal

* fix: remove SAML1 reference from gluu-attribute-rules.xml.vm

* fix(oxtrust): fix active scripts checkbox label

* feat: adjust json-config UI form as per GluuFederation/scim#20

* feat: remove test mode property usage GluuFederation/scim#20

* feat: add OAuth protection mechanism for scim GluuFederation/scim#20

* feat: add OAuth protection mechanism for scim pt 2. GluuFederation/scim#20

* feat: remove extra logging statements GluuFederation/scim#20

* feat: fix commit 0ff85f7 GluuFederation/scim#20

* feat(oxtrust): enhance usability of scopes picker in client edition form #2085

* feat(oxtrust): updating client id in passport IDP-initiated flow config throws Oops error. #2084

* feat: added http request extraction for shibboleth

* fix: malformed gluu-attribute-rules.xml.vm

* fix: relying-party template generated incorrect config data for shibboleth

* feat: adjust json-config UI form as per GluuFederation/scim#22

* feat: use URL Connection client executor when proxy is required

* fix: "Organization Configuration" throwing error #2075

* feat: use new method to lookup manger group

* feat: register new method in gluufn library

* fix: fix NPE when version is not exists

* fix: create connection provider before checking it's status

* fix: update to conform new ORM

* fix: fix AD server configuration

* (oxTrust) fix oops error when the sector identifier uri is not valid or the content is not valid

* chore: refactor REST services protection logic

Related GluuFederation/scim#26

* feat: add no-protection mode
GluuFederation/scim#26

* feat: store acr in user profile to allow use it in IDP

* Version 4.3.0.Final

* fix: use Final binaries

* fix: don't fail on javadoc

* fix(oxtrust): identity throws oops error on providing invalid sector uri which is not friendly, returning “oops” is a bug, and must be escalated. #2091

* feat: shorten sentence GluuFederation/scim#26

Co-authored-by: Gasmyr <thomas@gluu.org>
Co-authored-by: Milton BO <jmcm578@gmail.com>
Co-authored-by: YuriyZ <yzabrovarniy@gmail.com>
Co-authored-by: Dzouato Djeumen Rolain Bonaventure <uprightech@gmail.com>
Co-authored-by: Harjinder Dhanjal <malotian@gmail.com>
Co-authored-by: Jose <bonustrack310@gmail.com>
Co-authored-by: gasmyr <gasmyrmougang@yahoo.fr>
  • Loading branch information
8 people committed Oct 5, 2021
1 parent 6f10891 commit f7224ef
Show file tree
Hide file tree
Showing 203 changed files with 18,895 additions and 8,221 deletions.
161 changes: 161 additions & 0 deletions api-server/pom.xml
@@ -0,0 +1,161 @@
<?xml version="1.0"?>
<project
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.gluu</groupId>
<artifactId>oxtrust</artifactId>
<version>4.3.0.Final</version>
</parent>
<artifactId>oxtrust-api-server</artifactId>
<name>API Server</name>
<url>http://maven.apache.org</url>

<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<swagger-core-version>2.0.0</swagger-core-version>
<resteasy-version>3.0.11.Final</resteasy-version>
<slf4j-version>1.6.3</slf4j-version>
<junit-version>4.8.1</junit-version>
<servlet-api-version>2.5</servlet-api-version>
</properties>
<build>
<finalName>oxtrust-api-server</finalName>

<resources>
<resource>
<directory>src/main/resources</directory>
<includes>
<include>**/*.xml</include>
<include>**/*.properties</include>
<include>**/*.js</include>
</includes>
</resource>
</resources>

<testResources>
<testResource>
<directory>src/test/resources</directory>
<includes>
<include>**/*.json</include>
<include>**/*.xml</include>
</includes>
</testResource>
</testResources>

<plugins>
<plugin>
<groupId>io.swagger.core.v3</groupId>
<artifactId>swagger-maven-plugin</artifactId>
<version>2.0.8</version>
<configuration>
<outputFileName>openapi</outputFileName>
<outputPath>${project.build.directory}/generated</outputPath>
<!--<outputFormat>JSONANDYAML</outputFormat>-->
<outputFormat>JSONANDYAML</outputFormat>
<resourcePackages>
<package>org.gluu.oxtrust.api.server.api.impl</package>
</resourcePackages>
<prettyPrint>TRUE</prettyPrint>
</configuration>
<executions>
<execution>
<phase>compile</phase>
<goals>
<goal>resolve</goal>
</goals>
</execution>
</executions>
</plugin>
<!-- maven assembly plugin -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
<version>3.1.1</version>
<executions>
<execution>
<id>package-openapi-spec</id>
<phase>package</phase>
<goals>
<goal>single</goal>
</goals>
<configuration>
<descriptors>
<descriptor>src/assembly/openapi-spec.xml</descriptor>
</descriptors>
</configuration>
</execution>
</executions>
</plugin>
</plugins>

<pluginManagement>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<skipTests>true</skipTests> <!-- set it to false when test sources appear -->
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<source>1.8</source>
<target>1.8</target>
<encoding>UTF-8</encoding>
</configuration>
</plugin>
</plugins>
</pluginManagement>
</build>

<dependencies>
<dependency>
<groupId>javax</groupId>
<artifactId>javaee-api</artifactId>
<version>8.0</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.gluu</groupId>
<artifactId>oxtrust-server</artifactId>
<exclusions>
<exclusion>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>io.swagger.core.v3</groupId>
<artifactId>swagger-jaxrs2</artifactId>
<version>2.0.8</version>
</dependency>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
</dependency>
<dependency>
<groupId>javax.ws.rs</groupId>
<artifactId>javax.ws.rs-api</artifactId>
<version>2.1</version>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
</dependency>
</dependencies>
</project>
15 changes: 15 additions & 0 deletions api-server/src/assembly/openapi-spec.xml
@@ -0,0 +1,15 @@
<assembly xmlns="http://maven.apache.org/ASSEMBLY/2.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.0.0 http://maven.apache.org/xsd/assembly-2.0.0.xsd">
<id>openapi</id>
<formats>
<format>zip</format>
</formats>
<includeBaseDirectory>false</includeBaseDirectory>
<fileSets>
<fileSet>
<directory>target/generated/</directory>
<outputDirectory>.\</outputDirectory>
</fileSet>
</fileSets>
</assembly>

0 comments on commit f7224ef

Please sign in to comment.