Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat: use Bearer token if OPA started with it #7353

Merged
merged 12 commits into from
Jan 12, 2024
Merged

feat: use Bearer token if OPA started with it #7353

Show file tree
Hide file tree
Changes from 9 commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
c672bbf
feat: use Bearer token if OPA started with it #7340
yurem Jan 11, 2024
4f21a7e
feat: use Bearer token if OPA started with it #7340
yurem Jan 11, 2024
411534f
feat: use Bearer token if OPA started with it #7340
yurem Jan 11, 2024
16a6005
feat: use Bearer token if OPA started with it #7340
yurem Jan 11, 2024
e8fa0d2
feat: use Bearer token if OPA started with it #7340
yurem Jan 12, 2024
16dd3c9
feat: use Bearer token if OPA started with it #7340
yurem Jan 12, 2024
aab04a8
feat: use Bearer token if OPA started with it #7340
yurem Jan 12, 2024
beff3d5
feat: use Bearer token if OPA started with it #7340
yurem Jan 12, 2024
127e1a8
Merge branch 'main' into lock6
yurem Jan 12, 2024
03688b3
chore: use EncryptionService core-service in script
yurem Jan 12, 2024
6b198b1
Merge branch 'lock6' of https://github.com/JanssenProject/jans into l…
yurem Jan 12, 2024
a8d1526
chore: use EncryptionService core-service in script
yurem Jan 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions ...th-server/common/src/main/java/io/jans/as/common/service/common/ConfigurationService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
import io.jans.as.persistence.model.configuration.GluuConfiguration;
import io.jans.model.SmtpConfiguration;
import io.jans.orm.PersistenceEntryManager;
import io.jans.service.EncryptionService;
import io.jans.util.StringHelper;
import io.jans.util.security.StringEncrypter.EncryptionException;
import org.slf4j.Logger;
Expand Down
80 changes: 0 additions & 80 deletions ...-auth-server/common/src/main/java/io/jans/as/common/service/common/EncryptionService.java
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion jans-auth-server/server/src/main/java/io/jans/as/server/service/AppInitializer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@
import com.google.common.collect.Lists;

import io.jans.as.common.service.common.ApplicationFactory;
import io.jans.as.common.service.common.EncryptionService;
import io.jans.as.model.common.FeatureFlagType;
import io.jans.as.model.configuration.AppConfiguration;
import io.jans.as.persistence.model.configuration.GluuConfiguration;
Expand Down Expand Up @@ -48,6 +47,7 @@
import io.jans.orm.model.PersistenceConfiguration;
import io.jans.orm.util.properties.FileConfiguration;
import io.jans.service.ApplicationConfigurationFactory;
import io.jans.service.EncryptionService;
import io.jans.service.PythonService;
import io.jans.service.cdi.async.Asynchronous;
import io.jans.service.cdi.event.ApplicationInitialized;
Expand Down
27 changes: 17 additions & 10 deletions jans-auth-server/server/src/main/java/io/jans/as/server/service/ClientService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,24 @@

package io.jans.as.server.service;

import static org.apache.commons.lang3.BooleanUtils.isFalse;
import static org.apache.commons.lang3.BooleanUtils.isTrue;

import java.util.Collection;
import java.util.Date;
import java.util.GregorianCalendar;
import java.util.List;
import java.util.Set;
import java.util.TimeZone;

import org.apache.commons.lang3.BooleanUtils;
import org.json.JSONArray;
import org.slf4j.Logger;

import com.google.common.base.Preconditions;
import com.google.common.collect.Sets;

import io.jans.as.common.model.registration.Client;
import io.jans.as.common.service.common.EncryptionService;
import io.jans.as.model.common.AuthenticationMethod;
import io.jans.as.model.config.StaticConfiguration;
import io.jans.as.model.configuration.AppConfiguration;
Expand All @@ -21,22 +36,14 @@
import io.jans.orm.model.base.CustomObjectAttribute;
import io.jans.service.BaseCacheService;
import io.jans.service.CacheService;
import io.jans.service.EncryptionService;
import io.jans.service.LocalCacheService;
import io.jans.util.StringHelper;
import io.jans.util.security.StringEncrypter;
import io.jans.util.security.StringEncrypter.EncryptionException;
import jakarta.ejb.Stateless;
import jakarta.inject.Inject;
import jakarta.inject.Named;
import org.apache.commons.lang3.BooleanUtils;
import org.json.JSONArray;
import com.google.common.base.Preconditions;
import org.slf4j.Logger;

import java.util.*;

import static org.apache.commons.lang3.BooleanUtils.isFalse;
import static org.apache.commons.lang3.BooleanUtils.isTrue;

/**
* Provides operations with clients.
Expand Down
13 changes: 7 additions & 6 deletions jans-auth-server/server/src/main/java/io/jans/as/server/service/push/sns/PushSnsService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,11 @@

package io.jans.as.server.service.push.sns;

import java.io.IOException;
import java.util.Date;
import java.util.HashMap;
import java.util.Map;

import com.amazonaws.auth.AWSStaticCredentialsProvider;
import com.amazonaws.auth.BasicAWSCredentials;
import com.amazonaws.regions.Regions;
Expand All @@ -16,19 +21,15 @@
import com.amazonaws.services.sns.model.MessageAttributeValue;
import com.amazonaws.services.sns.model.PublishRequest;
import com.amazonaws.services.sns.model.PublishResult;

import io.jans.as.common.model.common.User;
import io.jans.as.common.service.common.EncryptionService;
import io.jans.as.model.configuration.AppConfiguration;
import io.jans.as.server.util.ServerUtil;
import io.jans.orm.PersistenceEntryManager;

import io.jans.service.EncryptionService;
import jakarta.ejb.Stateless;
import jakarta.inject.Inject;
import jakarta.inject.Named;
import java.io.IOException;
import java.util.Date;
import java.util.HashMap;
import java.util.Map;

/**
* Provides operations to send AWS SNS push messages
Expand Down
2 changes: 1 addition & 1 deletion jans-auth-server/server/src/test/java/io/jans/as/server/BaseComponentTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@

package io.jans.as.server;

import io.jans.as.common.service.common.EncryptionService;
import io.jans.as.common.service.common.InumService;
import io.jans.as.common.service.common.UserService;
import io.jans.as.model.config.StaticConfiguration;
Expand All @@ -24,6 +23,7 @@
import io.jans.as.server.uma.service.UmaRptService;
import io.jans.orm.PersistenceEntryManager;
import io.jans.service.CacheService;
import io.jans.service.EncryptionService;
import io.jans.service.cdi.util.CdiUtil;

/**
Expand Down
2 changes: 1 addition & 1 deletion ...s/admin-ui-plugin/src/main/java/io/jans/ca/plugin/adminui/service/auth/OAuth2Service.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
import com.google.common.base.Strings;
import com.google.common.collect.Sets;
import io.jans.as.client.TokenRequest;
import io.jans.as.common.service.common.EncryptionService;
import io.jans.as.model.common.GrantType;
import io.jans.ca.plugin.adminui.model.auth.ApiTokenRequest;
import io.jans.ca.plugin.adminui.model.auth.TokenResponse;
Expand All @@ -14,6 +13,7 @@
import io.jans.ca.plugin.adminui.service.config.AUIConfigurationService;
import io.jans.ca.plugin.adminui.utils.CommonUtils;
import io.jans.ca.plugin.adminui.utils.ErrorResponse;
import io.jans.service.EncryptionService;
import jakarta.inject.Inject;
import jakarta.inject.Singleton;
import jakarta.ws.rs.core.Response;
Expand Down
2 changes: 1 addition & 1 deletion ...lugin/src/main/java/io/jans/ca/plugin/adminui/service/config/AUIConfigurationService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
import com.google.api.client.util.Strings;
import com.google.common.collect.Maps;
import io.jans.as.client.TokenRequest;
import io.jans.as.common.service.common.EncryptionService;
import io.jans.as.model.common.GrantType;
import io.jans.as.model.config.adminui.AdminConf;
import io.jans.as.model.config.adminui.LicenseConfig;
Expand All @@ -19,6 +18,7 @@
import io.jans.ca.plugin.adminui.utils.ErrorResponse;
import io.jans.configapi.service.auth.ConfigurationService;
import io.jans.orm.PersistenceEntryManager;
import io.jans.service.EncryptionService;
import jakarta.inject.Inject;
import jakarta.inject.Singleton;
import jakarta.ws.rs.core.Response;
Expand Down
2 changes: 1 addition & 1 deletion ...-link-plugin/src/main/java/io/jans/configapi/plugin/link/rest/JansLinkConfigResource.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,14 @@

package io.jans.configapi.plugin.link.rest;

import io.jans.as.common.service.common.EncryptionService;
import io.jans.configapi.core.rest.BaseResource;
import io.jans.configapi.core.rest.ProtectedApi;
import io.jans.configapi.plugin.link.util.Constants;
import io.jans.configapi.plugin.link.service.JansLinkService;
import io.jans.configapi.util.ApiAccessConstants;
import io.jans.link.model.config.AppConfiguration;
import io.jans.model.ldap.GluuLdapConfiguration;
import io.jans.service.EncryptionService;
import io.jans.util.security.StringEncrypter.EncryptionException;

import io.swagger.v3.oas.annotations.Operation;
Expand Down
2 changes: 1 addition & 1 deletion ...config-api/server/src/main/java/io/jans/configapi/rest/resource/auth/ClientsResource.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@
import com.github.fge.jsonpatch.JsonPatchException;
import static io.jans.as.model.util.Util.escapeLog;
import io.jans.as.common.model.registration.Client;
import io.jans.as.common.service.common.EncryptionService;
import io.jans.as.common.service.common.InumService;
import io.jans.as.persistence.model.Scope;
import io.jans.configapi.core.rest.ProtectedApi;
Expand All @@ -28,6 +27,7 @@
import io.jans.orm.PersistenceEntryManager;
import io.jans.orm.exception.EntryPersistenceException;
import io.jans.orm.model.PagedResult;
import io.jans.service.EncryptionService;
import io.jans.util.StringHelper;
import io.jans.util.security.StringEncrypter.EncryptionException;

Expand Down
2 changes: 1 addition & 1 deletion ...fig-api/server/src/main/java/io/jans/configapi/rest/resource/auth/ConfigSmtpResource.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,13 @@
package io.jans.configapi.rest.resource.auth;

import io.jans.as.common.service.common.ConfigurationService;
import io.jans.as.common.service.common.EncryptionService;
import io.jans.as.persistence.model.configuration.GluuConfiguration;
import io.jans.configapi.core.rest.ProtectedApi;
import io.jans.configapi.util.ApiAccessConstants;
import io.jans.configapi.util.ApiConstants;
import io.jans.model.SmtpConfiguration;
import io.jans.model.SmtpTest;
import io.jans.service.EncryptionService;
import io.jans.service.MailService;
import io.jans.util.security.StringEncrypter.EncryptionException;

Expand Down
2 changes: 1 addition & 1 deletion ...-config-api/server/src/main/java/io/jans/configapi/service/auth/CouchbaseConfService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@

import com.github.fge.jackson.JacksonUtils;
import com.google.common.collect.Lists;
import io.jans.as.common.service.common.EncryptionService;
import io.jans.as.persistence.model.configuration.GluuConfiguration;
import io.jans.as.persistence.model.configuration.IDPAuthConf;
import io.jans.orm.couchbase.model.CouchbaseConnectionConfiguration;
import io.jans.service.EncryptionService;
import io.jans.util.security.StringEncrypter;
import org.apache.commons.lang3.StringUtils;

Expand Down
2 changes: 1 addition & 1 deletion ...fig-api/server/src/main/java/io/jans/configapi/service/auth/LdapConfigurationService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@
import com.github.fge.jackson.JacksonUtils;
import com.google.common.collect.Iterables;
import com.google.common.collect.Lists;
import io.jans.as.common.service.common.EncryptionService;
import io.jans.as.persistence.model.configuration.GluuConfiguration;
import io.jans.as.persistence.model.configuration.IDPAuthConf;
import io.jans.model.ldap.GluuLdapConfiguration;
import io.jans.service.EncryptionService;
import io.jans.util.security.StringEncrypter;
import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
Expand Down
2 changes: 1 addition & 1 deletion jans-config-api/server/src/main/java/io/jans/configapi/service/auth/SqlConfService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@

import com.github.fge.jackson.JacksonUtils;
import com.google.common.collect.Lists;
import io.jans.as.common.service.common.EncryptionService;
import io.jans.as.persistence.model.configuration.GluuConfiguration;
import io.jans.as.persistence.model.configuration.IDPAuthConf;
import io.jans.orm.sql.model.SqlConnectionConfiguration;
import io.jans.service.EncryptionService;
import io.jans.util.security.StringEncrypter;
import org.apache.commons.lang3.StringUtils;

Expand Down
2 changes: 1 addition & 1 deletion jans-config-api/server/src/main/java/io/jans/configapi/util/AuthUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
import io.jans.as.client.RevokeSessionResponse;
import io.jans.as.client.TokenResponse;
import io.jans.as.common.model.registration.Client;
import io.jans.as.common.service.common.EncryptionService;
import io.jans.as.model.common.ScopeType;
import io.jans.as.model.uma.wrapper.Token;
import io.jans.as.model.util.Util;
Expand All @@ -22,6 +21,7 @@
import io.jans.configapi.service.auth.ConfigurationService;
import io.jans.configapi.service.auth.ClientService;
import io.jans.configapi.service.auth.ScopeService;
import io.jans.service.EncryptionService;
import io.jans.util.security.StringEncrypter.EncryptionException;

import java.lang.reflect.Method;
Expand Down
Loading