From 2ed9a58545dbd81327d893f6c20b88b7942503f5 Mon Sep 17 00:00:00 2001
From: Timm Fitschen <t.fitschen@indiscale.com>
Date: Wed, 30 Jun 2021 18:45:23 +0200
Subject: [PATCH] WIP auth with base64 encoded string
---
.../caosdb/server/grpc/AuthInterceptor.java | 19 ++++++++++---------
1 file changed, 10 insertions(+), 9 deletions(-)
diff --git a/src/main/java/org/caosdb/server/grpc/AuthInterceptor.java b/src/main/java/org/caosdb/server/grpc/AuthInterceptor.java
index 96396ff5..ef7bb613 100644
--- a/src/main/java/org/caosdb/server/grpc/AuthInterceptor.java
+++ b/src/main/java/org/caosdb/server/grpc/AuthInterceptor.java
@@ -1,5 +1,14 @@
package org.caosdb.server.grpc;
+import java.util.Base64;
+import org.apache.shiro.SecurityUtils;
+import org.apache.shiro.authc.AuthenticationException;
+import org.apache.shiro.subject.Subject;
+import org.caosdb.server.CaosDBServer;
+import org.caosdb.server.ServerProperties;
+import org.caosdb.server.accessControl.AnonymousAuthenticationToken;
+import org.caosdb.server.accessControl.RealmUsernamePasswordToken;
+import org.caosdb.server.accessControl.UserSources;
import io.grpc.Context;
import io.grpc.Contexts;
import io.grpc.Metadata;
@@ -9,14 +18,6 @@ import io.grpc.ServerCall.Listener;
import io.grpc.ServerCallHandler;
import io.grpc.ServerInterceptor;
import io.grpc.Status;
-import org.apache.shiro.SecurityUtils;
-import org.apache.shiro.authc.AuthenticationException;
-import org.apache.shiro.subject.Subject;
-import org.caosdb.server.CaosDBServer;
-import org.caosdb.server.ServerProperties;
-import org.caosdb.server.accessControl.AnonymousAuthenticationToken;
-import org.caosdb.server.accessControl.RealmUsernamePasswordToken;
-import org.caosdb.server.accessControl.UserSources;
/**
* ServerInterceptor for Authentication. If the authentication succeeds or if the caller is
@@ -50,7 +51,7 @@ class AuthInterceptor implements ServerInterceptor {
* subject.
*/
private Subject basicAuth(final String base64) {
- final String plain = base64; // TODO =new String(Base64.getDecoder().decode(base64));
+ final String plain = new String(Base64.getDecoder().decode(base64));
final String[] split = plain.split(":", 2);
final String username = split[0];
final String password = split[1];
--
GitLab