diff --git a/hsarjcli/src/de/hsadmin/jscli/CASTicket.java b/hsarjcli/src/de/hsadmin/jscli/CASTicket.java index c889fd9..6ec99fa 100644 --- a/hsarjcli/src/de/hsadmin/jscli/CASTicket.java +++ b/hsarjcli/src/de/hsadmin/jscli/CASTicket.java @@ -32,12 +32,19 @@ public class CASTicket { this.user = user; this.runAs = runAs; Config config = Config.getInstance(); - loginURL = config.getProperty("loginURL", LOGIN_URL); backendURL = config.getProperty("backendURL", BACKEND_URL); - grantingTicket = readFiledGrantingTicket(); + loginURL = config.getProperty("loginURL", LOGIN_URL); + if ("TestUmgebung".equals(loginURL)) { + grantingTicket = "ticket:" + user; + } else { + grantingTicket = readFiledGrantingTicket(); + } } public String getTicket() throws JSCliException { + if (grantingTicket != null && grantingTicket.startsWith("ticket:")) { + return grantingTicket.replaceFirst("ticket", "user"); + } try { String encodedParams = URLEncoder.encode("service", "UTF-8") + "=" + URLEncoder.encode(backendURL, "UTF-8"); diff --git a/hsarjcli/src/de/hsadmin/jscli/Main.java b/hsarjcli/src/de/hsadmin/jscli/Main.java index 3f3a294..11d0675 100644 --- a/hsarjcli/src/de/hsadmin/jscli/Main.java +++ b/hsarjcli/src/de/hsadmin/jscli/Main.java @@ -38,6 +38,9 @@ public class Main { throw new JSCliException("fatal error: console not found"); } String command = console.readLine("%s@hsadmin>", runAs); + if (command == null) { + command = ""; + } while (!("bye".equals(command.trim()) || "exit".equals(command.trim()) || "quit".equals(command.trim()))) { try { console.printf("%s\n", formatter.format(scriptClient.execute(command))); @@ -45,9 +48,12 @@ public class Main { console.printf("ERR: %s\n", e.getLocalizedMessage()); } command = console.readLine("%s@hsadmin>", runAs); - while (command.endsWith("\\")) { + if (command == null) { + command = ""; + } + while (command.trim().endsWith("\\")) { command = command.substring(0, command.length() - 1) + - console.readLine(">"); + "\n" + console.readLine(">"); } } }