Debug-output einheitlich über alle aufgerufenen Resourcen.
diff --git a/.gitignore b/.gitignore
index fb845f8..1326b33 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,3 +9,7 @@
admin_token
/bin/
/db.sqlite
+
+
+# FB specific Kustvakt.conf
+src\main\resources\Kustvakt.conf
\ No newline at end of file
diff --git a/src/main/java/de/ids_mannheim/korap/security/auth/KustvaktAuthenticationManager.java b/src/main/java/de/ids_mannheim/korap/security/auth/KustvaktAuthenticationManager.java
index db6cea5..d11355e 100644
--- a/src/main/java/de/ids_mannheim/korap/security/auth/KustvaktAuthenticationManager.java
+++ b/src/main/java/de/ids_mannheim/korap/security/auth/KustvaktAuthenticationManager.java
@@ -213,7 +213,7 @@
// to be absolutely sure:
user.setCorpusAccess(User.CorpusAccess.FREE);
if( DEBUG_LOG == true )
- System.out.println("setAccessAndLocation: DemoUser.");
+ System.out.printf("setAccessAndLocation: DemoUser: location=%s, access=%s.\n", user.locationtoString(), user.accesstoString());
return;
}
@@ -247,6 +247,9 @@
user.setLocation(location);
user.setCorpusAccess(corpusAccess);
+ if( DEBUG_LOG == true )
+ System.out.printf("setAccessAndLocation: KorAPUser: location=%s, access=%s.\n", user.locationtoString(), user.accesstoString());
+
}
} // getAccess
diff --git a/src/main/java/de/ids_mannheim/korap/user/User.java b/src/main/java/de/ids_mannheim/korap/user/User.java
index 5846b73..1792682 100644
--- a/src/main/java/de/ids_mannheim/korap/user/User.java
+++ b/src/main/java/de/ids_mannheim/korap/user/User.java
@@ -175,6 +175,30 @@
return sb.toString();
}
+ public String locationtoString()
+
+ {
+ if( this.location == Location.INTERN)
+ return "INTERN";
+ else if( this.location == Location.EXTERN )
+ return "EXTERN";
+ else
+ return "???";
+ }
+
+ public String accesstoString()
+
+ {
+ if( this.corpusAccess == CorpusAccess.ALL )
+ return "ALL";
+ else if( this.corpusAccess == CorpusAccess.PUB )
+ return "PUB";
+ else if( this.corpusAccess == CorpusAccess.FREE )
+ return "FREE";
+ else
+ return "???";
+ }
+
public static class UserFactory {
public static KorAPUser getUser (String username) {
diff --git a/src/main/java/de/ids_mannheim/korap/web/service/full/AuthService.java b/src/main/java/de/ids_mannheim/korap/web/service/full/AuthService.java
index 76d49ae..331ead1 100644
--- a/src/main/java/de/ids_mannheim/korap/web/service/full/AuthService.java
+++ b/src/main/java/de/ids_mannheim/korap/web/service/full/AuthService.java
@@ -45,7 +45,7 @@
@Produces(MediaType.TEXT_HTML + ";charset=utf-8")
public class AuthService {
- private static Boolean DEBUG_LOG = false;
+ private static Boolean DEBUG_LOG = true;
//todo: bootstrap function to transmit certain default configuration settings and examples (example user queries,
// default usersettings, etc.)
@@ -176,7 +176,8 @@
// todo: is this necessary?
// attr.putAll(data.fields());
controller.setAccessAndLocation(user, headers);
-
+ if( DEBUG_LOG == true )
+ System.out.printf("Debug: /apiToken/: location=%s, access='%s'.\n", user.locationtoString(), user.accesstoString());
attr.put(Attributes.LOCATION, user.getLocation());
attr.put(Attributes.CORPUS_ACCESS, user.getCorpusAccess());
context = controller.createTokenContext(user, attr, Attributes.API_AUTHENTICATION);
diff --git a/src/main/java/de/ids_mannheim/korap/web/service/full/ResourceService.java b/src/main/java/de/ids_mannheim/korap/web/service/full/ResourceService.java
index 5697d35..97aace6 100644
--- a/src/main/java/de/ids_mannheim/korap/web/service/full/ResourceService.java
+++ b/src/main/java/de/ids_mannheim/korap/web/service/full/ResourceService.java
@@ -494,6 +494,7 @@
try {
user = controller.getUser(context.getUsername());
controller.setAccessAndLocation(user, headers);
+ System.out.printf("Debug: /search/: location=%s, access='%s'.\n", user.locationtoString(), user.accesstoString());
}
catch (KustvaktException e) {
jlog.error("Failed retrieving user in the search service: {}",
@@ -1163,7 +1164,7 @@
try {
user = controller.getUser(tokenContext.getUsername());
controller.setAccessAndLocation(user, headers);
- System.out.println("Debug: getMatchInfo: setting Access & Location: done.");
+ System.out.printf("Debug: /getMatchInfo/: location=%s, access='%s'.\n", user.locationtoString(), user.accesstoString());
}
catch (KustvaktException e) {
jlog.error("Failed getting user in the matchInfo service: {}",