From af8f5b3a802488f16ec4866dcba071c0c50d11ca Mon Sep 17 00:00:00 2001 From: Michael Jumper Date: Fri, 21 Sep 2018 17:32:21 -0700 Subject: [PATCH] GUACAMOLE-622: Add parameter definitions for telnet login success/failure regex. --- .../org/apache/guacamole/protocols/telnet.json | 12 ++++++++++++ guacamole/src/main/webapp/translations/en.json | 3 +++ 2 files changed, 15 insertions(+) diff --git a/guacamole-ext/src/main/resources/org/apache/guacamole/protocols/telnet.json b/guacamole-ext/src/main/resources/org/apache/guacamole/protocols/telnet.json index 60064a791..42d5be018 100644 --- a/guacamole-ext/src/main/resources/org/apache/guacamole/protocols/telnet.json +++ b/guacamole-ext/src/main/resources/org/apache/guacamole/protocols/telnet.json @@ -27,9 +27,21 @@ "name" : "password", "type" : "PASSWORD" }, + { + "name" : "username-regex", + "type" : "TEXT" + }, { "name" : "password-regex", "type" : "TEXT" + }, + { + "name" : "login-success-regex", + "type" : "TEXT" + }, + { + "name" : "login-failure-regex", + "type" : "TEXT" } ] }, diff --git a/guacamole/src/main/webapp/translations/en.json b/guacamole/src/main/webapp/translations/en.json index 8ce4d16a7..e80ac90c7 100644 --- a/guacamole/src/main/webapp/translations/en.json +++ b/guacamole/src/main/webapp/translations/en.json @@ -563,7 +563,10 @@ "FIELD_HEADER_FONT_NAME" : "Font name:", "FIELD_HEADER_FONT_SIZE" : "Font size:", "FIELD_HEADER_HOSTNAME" : "Hostname:", + "FIELD_HEADER_LOGIN_FAILURE_REGEX" : "Login failure regular expression:", + "FIELD_HEADER_LOGIN_SUCCESS_REGEX" : "Login success regular expression:", "FIELD_HEADER_USERNAME" : "Username:", + "FIELD_HEADER_USERNAME_REGEX" : "Username regular expression:", "FIELD_HEADER_PASSWORD" : "Password:", "FIELD_HEADER_PASSWORD_REGEX" : "Password regular expression:", "FIELD_HEADER_PORT" : "Port:",