From cbd29cf45b7e9159fd2abfc3281b26ddc4b51ed7 Mon Sep 17 00:00:00 2001 From: Akshay Joshi Date: Fri, 18 Feb 2022 11:39:11 +0530 Subject: [PATCH] Change the hostname validation to check only for leading and trailing spaces. refs #7181 --- .../server_groups/servers/static/js/server.ui.js | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/web/pgadmin/browser/server_groups/servers/static/js/server.ui.js b/web/pgadmin/browser/server_groups/servers/static/js/server.ui.js index 61a3aabfc..f788c621e 100644 --- a/web/pgadmin/browser/server_groups/servers/static/js/server.ui.js +++ b/web/pgadmin/browser/server_groups/servers/static/js/server.ui.js @@ -85,14 +85,6 @@ export default class ServerSchema extends BaseUISchema { return pgAdmin.Browser.utils.pg_libpq_version < 100000; } - validateHost(str) { - // added above condition for unix socket where directory starts with / - if (str.startsWith('/')) { - return true; - } - return /^(([a-zA-Z0-9]|[a-zA-Z0-9][a-zA-Z0-9\-]*[a-zA-Z0-9])\.)*([A-Za-z0-9]|[A-Za-z0-9][A-Za-z0-9\-]*[A-Za-z0-9])$/.test(str); - } - get baseFields() { let obj = this; return [ @@ -481,7 +473,8 @@ export default class ServerSchema extends BaseUISchema { /* Hostname, IP address validate */ if (state.host) { - if (!this.validateHost(state.host)){ + // Check for leading and trailing spaces. + if (/^\s|\s$/.test(state.host)){ errmsg = gettext('Host name must be valid hostname or IPv4 or IPv6 address.'); setError('host', errmsg); return true;