Browse Source

import wsmancli-2.6.0-10.el8_6

c8s imports/c8s/wsmancli-2.6.0-10.el8_6
CentOS Sources 3 months ago
committed by Stepan Oksanichenko
parent
commit
c6f82b4041
  1. 127
      SOURCES/http-unauthorized-improve.patch
  2. 11
      SPECS/wsmancli.spec

127
SOURCES/http-unauthorized-improve.patch

@ -0,0 +1,127 @@
diff -up wsmancli-2.6.0/src/wsman.c.orig wsmancli-2.6.0/src/wsman.c
--- wsmancli-2.6.0/src/wsman.c.orig 2015-06-11 10:50:04.000000000 +0200
+++ wsmancli-2.6.0/src/wsman.c 2022-07-19 09:09:48.518951546 +0200
@@ -63,7 +63,11 @@ static char *cert = NULL;
static char *sslkey = NULL;
static char *endpoint = NULL;
static char *username = NULL;
+static char *username_given = NULL; /* copy of either the username from env or cmdline*/
+static char *username_prev = NULL; /* input username to request_usr_pwd() when called last time */
static char *password = NULL;
+static char *password_given = NULL; /* copy of either the password from env or cmdline */
+static char *password_prev = NULL; /* input password to request_usr_pwd() when called last time */
static char *server = "localhost";
static char *agent = NULL;
static char *url_path = NULL;
@@ -495,28 +499,79 @@ request_usr_pwd( WsManClient *client, ws
char user[21];
char *p;
- fprintf(stdout,"Authentication failed, please retry\n");
- /*
- fprintf(stdout, "%s authentication is used\n",
- wsmc_transport_get_auth_name( auth));
- */
- printf("User name: ");
- fflush(stdout);
- if ( (p = fgets(user, 20, stdin) ) != NULL )
- {
-
- if (strchr(user, '\n'))
- (*(strchr(user, '\n'))) = '\0';
- *username = u_strdup_printf ("%s", user);
- } else {
- *username = NULL;
+ /*
+ * fprintf(stdout,"Authentication failed, please retry\n");
+ *
+ * this message shall not be printed by this function as it cannot decide on the
+ * reason it was called for. It does not control the authentication process.
+ * wsmc_handler is better suited for such a decision making.
+ */
+
+ if (username_given) {
+ if (password_given) {
+ /* Initially provided combination of password and username is not valid.
+ * Request user to type both. Here I assume, that wsmc_handler called back to
+ * this function after trying a first authentication using these credentials.
+ */
+ } else {
+ /* Initially no password was provided => no authentication tried during first
+ * iteration of while loop in wsmc_handler. Check previously typed credentials
+ */
+ if (username_prev) {
+ /* This is a second call of this function, assuming only wsmc_handler is using it
+ * as a callback function. Therefore, there must have been a previous attempt to
+ * authenticate, but this previous combination of username and password did not
+ * lead to a successful authentication. Request new credentials, username_prev will
+ * be set each time after user has provided a username.
+ */
+ } else {
+ /* First time wsmc_handler calls back to this function. No password given on the
+ * command line or via the environment variable. Therefore wsmc_handler cannot
+ * have tried http authentication. A username was given on the command line or
+ * via an environment variable. And the user wants us to try this name at least
+ * at first. So, let's do him a favour and use it. When we are called back again,
+ * we will ask the user to provide a new name or the same, but a different password.
+ */
+ *username = u_strdup(username_given);
+ }
+ }
+ }
+
+ if (*username == NULL) {
+ printf("User name: ");
+ fflush(stdout);
+ if ( (p = fgets(user, 20, stdin) ) != NULL )
+ {
+ if (strchr(user, '\n'))
+ (*(strchr(user, '\n'))) = '\0';
+ *username = u_strdup_printf ("%s", user);
+ } else {
+ *username = NULL;
+ }
+ }
+
+ /* after successfull receipt of a new username, store a copy at username_prev */
+ if (*username) {
+ if ( username_prev ) {
+ u_free(username_prev);
+ username_prev = NULL;
+ }
+ username_prev = u_strdup(*username);
}
+ /* but always ask for the password !? */
pw = (char *)getpass("Password: ");
*password = u_strdup_printf ("%s", pw);
-}
-
+ /* make backup, *password will become free'd when next try of http-auth fails */
+ if (*password) {
+ if (password_prev) {
+ u_free(password_prev);
+ password_prev = NULL;
+ }
+ password_prev = u_strdup(*password);
+ }
+}
static void
wsman_options_set_properties(client_opt_t *options)
@@ -647,6 +702,14 @@ int main(int argc, char **argv)
exit(EXIT_FAILURE);
}
+ /* save copies of username or password when given on the command line or via environment variables */
+ if ( username != NULL ) {
+ username_given = u_strdup(username);
+ }
+ if ( password != NULL ) {
+ password_given = u_strdup(password);
+ }
+
filename = (char *) config_file;
if (filename) {

11
SPECS/wsmancli.spec

@ -1,6 +1,6 @@
Name: wsmancli
Version: 2.6.0
Release: 8%{?dist}
Release: 10%{?dist}
License: BSD
Url: http://www.openwsman.org/
# You can get this tarball here:
@ -13,6 +13,7 @@ BuildRequires: openwsman-devel >= 2.1.0 pkgconfig curl-devel
BuildRequires: autoconf automake libtool
Requires: openwsman curl
Patch0: missing-pthread-symbols.patch
Patch1: http-unauthorized-improve.patch
Summary: WS-Management-Command line Interface
%description
@ -22,6 +23,7 @@ systems using Web Services Management protocol.
%prep
%setup -q
%patch0 -p1
%patch1 -p1 -b .http-unauthorized-improve
cp -fp %SOURCE1 %SOURCE2 %SOURCE3 .;
%build
@ -40,6 +42,13 @@ make DESTDIR=%{buildroot} install
%doc COPYING README AUTHORS
%changelog
* Tue Sep 13 2022 Vitezslav Crhonek <vcrhonek@redhat.com> - 2.6.0-10
- Rebuild
* Thu Sep 08 2022 Vitezslav Crhonek <vcrhonek@redhat.com> - 2.6.0-9
- Improve handling of HTTP 401 Unauthorized
Resolves: #2124890
* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2.6.0-8
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild

Loading…
Cancel
Save