Skip to content
Snippets Groups Projects

Compare revisions

Changes are shown as if the source revision was being merged into the target revision. Learn more about comparing revisions.

Source

Select target project
No results found
Select Git revision
  • dBucik/endpoint_auth_methods
  • dBucik/skip_logout_confirm
  • fix_juridiction
  • main
  • revert-d2e009d2
  • token_endpoint_auth_methods
  • mitreid-connect-0.9.0
  • mitreid-connect-0.9.1
  • mitreid-connect-0.9.2
  • mitreid-connect-0.9.3
  • mitreid-connect-1.0.0
  • mitreid-connect-1.0.1
  • mitreid-connect-1.0.10
  • mitreid-connect-1.0.11
  • mitreid-connect-1.0.12
  • mitreid-connect-1.0.13
  • mitreid-connect-1.0.14
  • mitreid-connect-1.0.15
  • mitreid-connect-1.0.16
  • mitreid-connect-1.0.17
  • mitreid-connect-1.0.18
  • mitreid-connect-1.0.19
  • mitreid-connect-1.0.2
  • mitreid-connect-1.0.20
  • mitreid-connect-1.0.21
  • mitreid-connect-1.0.22
  • mitreid-connect-1.0.3
  • mitreid-connect-1.0.4
  • mitreid-connect-1.0.5
  • mitreid-connect-1.0.6
  • mitreid-connect-1.0.7
  • mitreid-connect-1.0.8
  • mitreid-connect-1.0.9
  • mitreid-connect-1.1.0
  • mitreid-connect-1.1.1
  • mitreid-connect-1.1.10
  • mitreid-connect-1.1.11
  • mitreid-connect-1.1.12
  • mitreid-connect-1.1.13
  • mitreid-connect-1.1.14
  • mitreid-connect-1.1.15
  • mitreid-connect-1.1.16
  • mitreid-connect-1.1.17
  • mitreid-connect-1.1.18
  • mitreid-connect-1.1.19
  • mitreid-connect-1.1.2
  • mitreid-connect-1.1.3
  • mitreid-connect-1.1.4
  • mitreid-connect-1.1.5
  • mitreid-connect-1.1.6
  • mitreid-connect-1.1.7
  • mitreid-connect-1.1.8
  • mitreid-connect-1.1.9
  • mitreid-connect-1.2.0
  • mitreid-connect-1.2.0-RC1
  • mitreid-connect-1.2.0-RC2
  • mitreid-connect-1.2.1
  • mitreid-connect-1.2.2
  • mitreid-connect-1.2.3
  • mitreid-connect-1.2.4
  • mitreid-connect-1.2.5
  • mitreid-connect-1.2.6
  • mitreid-connect-1.3.0
  • mitreid-connect-1.3.0-RC1
  • mitreid-connect-1.3.0-RC2
  • mitreid-connect-1.3.1
  • mitreid-connect-1.3.2
  • mitreid-connect-1.3.3
  • v10.0.0
  • v10.0.1
  • v10.0.2
  • v10.0.3
  • v10.1.0
  • v10.1.1
  • v10.1.2
  • v10.1.3
  • v10.2.0
  • v10.2.1
  • v10.3.0
  • v10.3.1
  • v10.3.2
  • v10.3.3
  • v10.3.4
  • v10.4.0
  • v10.5.0
  • v10.5.1
  • v10.5.2
  • v10.5.3
  • v10.5.4
  • v11.0.0
  • v11.0.1
  • v11.0.2
  • v11.0.3
  • v12.0.0
  • v12.0.1
  • v12.0.2
  • v12.0.3
  • v12.0.4
  • v12.0.5
  • v12.1.0
  • v12.1.1
  • v12.1.2
  • v12.1.3
  • v12.1.4
  • v12.1.5
  • v12.1.6
106 results

Target

Select target project
  • perun/perun-proxyidp/v1/OpenID-Connect-Java-Spring-Server
1 result
Select Git revision
  • dBucik/endpoint_auth_methods
  • dBucik/skip_logout_confirm
  • fix_juridiction
  • main
  • revert-d2e009d2
  • token_endpoint_auth_methods
  • mitreid-connect-0.9.0
  • mitreid-connect-0.9.1
  • mitreid-connect-0.9.2
  • mitreid-connect-0.9.3
  • mitreid-connect-1.0.0
  • mitreid-connect-1.0.1
  • mitreid-connect-1.0.10
  • mitreid-connect-1.0.11
  • mitreid-connect-1.0.12
  • mitreid-connect-1.0.13
  • mitreid-connect-1.0.14
  • mitreid-connect-1.0.15
  • mitreid-connect-1.0.16
  • mitreid-connect-1.0.17
  • mitreid-connect-1.0.18
  • mitreid-connect-1.0.19
  • mitreid-connect-1.0.2
  • mitreid-connect-1.0.20
  • mitreid-connect-1.0.21
  • mitreid-connect-1.0.22
  • mitreid-connect-1.0.3
  • mitreid-connect-1.0.4
  • mitreid-connect-1.0.5
  • mitreid-connect-1.0.6
  • mitreid-connect-1.0.7
  • mitreid-connect-1.0.8
  • mitreid-connect-1.0.9
  • mitreid-connect-1.1.0
  • mitreid-connect-1.1.1
  • mitreid-connect-1.1.10
  • mitreid-connect-1.1.11
  • mitreid-connect-1.1.12
  • mitreid-connect-1.1.13
  • mitreid-connect-1.1.14
  • mitreid-connect-1.1.15
  • mitreid-connect-1.1.16
  • mitreid-connect-1.1.17
  • mitreid-connect-1.1.18
  • mitreid-connect-1.1.19
  • mitreid-connect-1.1.2
  • mitreid-connect-1.1.3
  • mitreid-connect-1.1.4
  • mitreid-connect-1.1.5
  • mitreid-connect-1.1.6
  • mitreid-connect-1.1.7
  • mitreid-connect-1.1.8
  • mitreid-connect-1.1.9
  • mitreid-connect-1.2.0
  • mitreid-connect-1.2.0-RC1
  • mitreid-connect-1.2.0-RC2
  • mitreid-connect-1.2.1
  • mitreid-connect-1.2.2
  • mitreid-connect-1.2.3
  • mitreid-connect-1.2.4
  • mitreid-connect-1.2.5
  • mitreid-connect-1.2.6
  • mitreid-connect-1.3.0
  • mitreid-connect-1.3.0-RC1
  • mitreid-connect-1.3.0-RC2
  • mitreid-connect-1.3.1
  • mitreid-connect-1.3.2
  • mitreid-connect-1.3.3
  • v10.0.0
  • v10.0.1
  • v10.0.2
  • v10.0.3
  • v10.1.0
  • v10.1.1
  • v10.1.2
  • v10.1.3
  • v10.2.0
  • v10.2.1
  • v10.3.0
  • v10.3.1
  • v10.3.2
  • v10.3.3
  • v10.3.4
  • v10.4.0
  • v10.5.0
  • v10.5.1
  • v10.5.2
  • v10.5.3
  • v10.5.4
  • v11.0.0
  • v11.0.1
  • v11.0.2
  • v11.0.3
  • v12.0.0
  • v12.0.1
  • v12.0.2
  • v12.0.3
  • v12.0.4
  • v12.0.5
  • v12.1.0
  • v12.1.1
  • v12.1.2
  • v12.1.3
  • v12.1.4
  • v12.1.5
  • v12.1.6
106 results
Show changes
Commits on Source (3)
## [17.1.4](https://gitlab.ics.muni.cz/perun/perun-proxyidp/v1/OpenID-Connect-Java-Spring-Server/compare/v17.1.3...v17.1.4) (2024-02-21)
### Bug Fixes
* 🐛 scheduled tasks, missing constant and non-used param ([61ab061](https://gitlab.ics.muni.cz/perun/perun-proxyidp/v1/OpenID-Connect-Java-Spring-Server/commit/61ab061cb87b0e4780b7f1b5ddcc40a82cbfe43a))
## [17.1.3](https://gitlab.ics.muni.cz/perun/perun-proxyidp/v1/OpenID-Connect-Java-Spring-Server/compare/v17.1.2...v17.1.3) (2024-02-14)
......
......@@ -21,7 +21,7 @@
<parent>
<groupId>cz.muni.ics</groupId>
<artifactId>perun-oidc-parent</artifactId>
<version>17.1.3</version>
<version>17.1.4</version>
<relativePath>../pom.xml</relativePath>
</parent>
......
......@@ -22,7 +22,7 @@
<parent>
<groupId>cz.muni.ics</groupId>
<artifactId>perun-oidc-parent</artifactId>
<version>17.1.3</version>
<version>17.1.4</version>
<relativePath>../pom.xml</relativePath>
</parent>
......
......@@ -4,6 +4,7 @@ import cz.muni.ics.oauth2.model.AuthorizationCodeEntity;
import cz.muni.ics.oauth2.model.DeviceCode;
import cz.muni.ics.oauth2.model.OAuth2AccessTokenEntity;
import cz.muni.ics.oauth2.model.OAuth2RefreshTokenEntity;
import cz.muni.ics.openid.connect.model.ApprovedSite;
import org.springframework.stereotype.Repository;
import javax.persistence.EntityManager;
......@@ -17,6 +18,8 @@ public class CustomClearTasks {
@PersistenceContext(unitName = "defaultPersistenceUnit")
private EntityManager manager;
public static final String HINT_TIMEOUT = "javax.persistence.query.timeout";
public int clearExpiredTokens(long timeout) {
int count = 0;
......@@ -34,7 +37,7 @@ public class CustomClearTasks {
"WHERE a.expiration <= :" + OAuth2AccessTokenEntity.PARAM_DATE);
query1.setParameter(OAuth2AccessTokenEntity.PARAM_DATE, new Date());
if (timeout > 0) {
query1.setHint("javax.persistence.query.timeout", timeout);
query1.setHint(HINT_TIMEOUT, timeout);
}
try {
count += query1.executeUpdate();
......@@ -52,7 +55,7 @@ public class CustomClearTasks {
"WHERE r.expiration <= :" + OAuth2RefreshTokenEntity.PARAM_DATE);
query2.setParameter(OAuth2RefreshTokenEntity.PARAM_DATE, new Date());
if (timeout > 0) {
query2.setHint("javax.persistence.query.timeout", timeout);
query2.setHint(HINT_TIMEOUT, timeout);
}
try {
count += query2.executeUpdate();
......@@ -71,7 +74,7 @@ public class CustomClearTasks {
"a.id NOT IN (SELECT r.authenticationHolder.id FROM OAuth2RefreshTokenEntity r) AND " +
"a.id NOT IN (SELECT c.authenticationHolder.id FROM AuthorizationCodeEntity c)");
if (timeout > 0) {
query3.setHint("javax.persistence.query.timeout", timeout);
query3.setHint(HINT_TIMEOUT, timeout);
}
try {
count += query3.executeUpdate();
......@@ -85,10 +88,12 @@ public class CustomClearTasks {
manager.flush();
manager.clear();
int count = 0;
Query query = manager.createQuery("DELETE FROM ApprovedSite a WHERE a.timeoutDate <= :date");
query.setParameter("date", new Date());
Query query = manager.createQuery(
"DELETE FROM ApprovedSite a WHERE a.timeoutDate <= :" + ApprovedSite.PARAM_DATE
);
query.setParameter(ApprovedSite.PARAM_DATE, new Date());
if (timeout > 0) {
query.setHint("javax.persistence.query.timeout", timeout);
query.setHint(HINT_TIMEOUT, timeout);
}
try {
count += query.executeUpdate();
......@@ -106,7 +111,7 @@ public class CustomClearTasks {
"WHERE a.expiration <= :" + AuthorizationCodeEntity.PARAM_DATE);
query.setParameter(AuthorizationCodeEntity.PARAM_DATE, new Date());
if (timeout > 0) {
query.setHint("javax.persistence.query.timeout", timeout);
query.setHint(HINT_TIMEOUT, timeout);
}
try {
count += query.executeUpdate();
......@@ -123,7 +128,7 @@ public class CustomClearTasks {
Query query = manager.createQuery("DELETE FROM DeviceCode d WHERE d.expiration <= :" + DeviceCode.PARAM_DATE);
query.setParameter(DeviceCode.PARAM_DATE, new Date());
if (timeout > 0) {
query.setHint("javax.persistence.query.timeout", timeout);
query.setHint(HINT_TIMEOUT, timeout);
}
try {
count += query.executeUpdate();
......@@ -138,10 +143,9 @@ public class CustomClearTasks {
manager.clear();
int count = 0;
Query query = manager.createQuery("DELETE FROM SavedUserAuthentication sa " +
"WHERE sa.id NOT IN (SELECT ah.userAuth FROM AuthenticationHolderEntity ah)");
query.setParameter(DeviceCode.PARAM_DATE, new Date());
"WHERE sa.id NOT IN (SELECT ah.userAuth FROM AuthenticationHolderEntity ah)");
if (timeout > 0) {
query.setHint("javax.persistence.query.timeout", timeout);
query.setHint(HINT_TIMEOUT, timeout);
}
try {
count += query.executeUpdate();
......
......@@ -82,6 +82,8 @@ public class ApprovedSite {
public static final String PARAM_CLIENT_ID = "clientId";
public static final String PARAM_USER_ID = "userId";
public static final String PARAM_DATE = "date";
@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
@Column(name = "id")
......
......@@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>cz.muni.ics</groupId>
<artifactId>perun-oidc-parent</artifactId>
<version>17.1.3</version>
<version>17.1.4</version>
<packaging>pom</packaging>
<modules>
......