diff options
| author | Simon Rettberg | 2024-05-15 16:51:50 +0200 |
|---|---|---|
| committer | Simon Rettberg | 2024-05-15 16:51:50 +0200 |
| commit | e9bdcfe9ffaf6974ce1fbf404279536b7c6368c2 (patch) | |
| tree | c84e3b21bf6bd0cb5a46614ad2ae89cf83f5bcfd /src/main/java/org/openslx/imagemaster/localrpc | |
| parent | Update Database classes to match dmsd (diff) | |
| download | masterserver-e9bdcfe9ffaf6974ce1fbf404279536b7c6368c2.tar.gz masterserver-e9bdcfe9ffaf6974ce1fbf404279536b7c6368c2.tar.xz masterserver-e9bdcfe9ffaf6974ce1fbf404279536b7c6368c2.zip | |
RPC: Add option to set session timeout on creation
Diffstat (limited to 'src/main/java/org/openslx/imagemaster/localrpc')
| -rw-r--r-- | src/main/java/org/openslx/imagemaster/localrpc/JsonUser.java | 10 | ||||
| -rw-r--r-- | src/main/java/org/openslx/imagemaster/localrpc/NetworkHandler.java | 2 |
2 files changed, 9 insertions, 3 deletions
diff --git a/src/main/java/org/openslx/imagemaster/localrpc/JsonUser.java b/src/main/java/org/openslx/imagemaster/localrpc/JsonUser.java index 3dff32f..80a4f53 100644 --- a/src/main/java/org/openslx/imagemaster/localrpc/JsonUser.java +++ b/src/main/java/org/openslx/imagemaster/localrpc/JsonUser.java @@ -19,8 +19,9 @@ public class JsonUser private String lastName = null; private String mail = null; private String role = null; - private String status; - private String error; + private String status = null; + private String error = null; + private int timeoutSeconds = 0; private String accessCode; @@ -54,5 +55,10 @@ public class JsonUser { return this.accessCode; } + + public int timeoutSeconds() + { + return this.timeoutSeconds; + } } diff --git a/src/main/java/org/openslx/imagemaster/localrpc/NetworkHandler.java b/src/main/java/org/openslx/imagemaster/localrpc/NetworkHandler.java index 4416647..ebe6993 100644 --- a/src/main/java/org/openslx/imagemaster/localrpc/NetworkHandler.java +++ b/src/main/java/org/openslx/imagemaster/localrpc/NetworkHandler.java @@ -136,7 +136,7 @@ public class NetworkHandler implements Runnable log.warn( "Invalid or inomplete RPC data (" + payload + ")" ); return "Invalid or incomplete RPC data"; } - ClientSessionData sd = SessionManager.addSession( new Session( u ), ju.accessCode() ); + ClientSessionData sd = SessionManager.addSession( new Session( u, ju.timeoutSeconds() * 1000 ), ju.accessCode() ); return "TOKEN:" + sd.authToken + " SESSIONID:" + sd.sessionId; } } catch ( Throwable t ) { |