Merge branch 'feature/temp-develop' into develop

Author: rjrudin

CODEOWNERS

@@ -2,5 +2,5 @@
 # Each line is a file pattern followed by one or more owners.
 
 # These owners will be the default owners for everything in the repo.
-* @anu3990 @billfarber @rjrudin @stevebio
+* @billfarber @rjrudin @stevebio
 

lib/www-authenticate-patched/md5.js

@@ -7,9 +7,15 @@
  */
 
 /*
+<<<<<<< HEAD
 * Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved.
 */
 const crypto= require('crypto');
+=======
+* Copyright © 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved.
+*/
+var crypto= require('crypto');
+>>>>>>> feature/temp-develop
 
 function md5(s) {
   return crypto.createHash('md5').update(s).digest('hex');

lib/www-authenticate-patched/parsers.js

@@ -1,34 +1,57 @@
 /*
+<<<<<<< HEAD
 * Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved.
 */
 
 /*
+=======
+>>>>>>> feature/temp-develop
  * www-authenticate
  * https://github.com/randymized/www-authenticate
  *
  * Copyright (c) 2013 Randy McLaughlin
  * Licensed under the MIT license.
  */
 
+<<<<<<< HEAD
 const ParseAuth= /(\w+)\s+(.*)/  // -> scheme, params
+=======
+/*
+* Copyright © 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved.
+*/
+var ParseAuth= /(\w+)\s+(.*)/  // -> scheme, params
+>>>>>>> feature/temp-develop
   , Separators= /([",=])/
   ;
 
 function parse_params(header) {
   // This parser will definitely fail if there is more than one challenge
+<<<<<<< HEAD
   let tok, _i, _len, key, value;
   let state= 0;   //0: token,
   const m= header.split(Separators);
   for (_i = 0, _len = m.length; _i < _len; _i++) {
     tok = m[_i];
     if (!tok.length) {continue;}
+=======
+  var tok, _i, _len, key, value;
+  var state= 0;   //0: token,
+  var m= header.split(Separators)
+  for (_i = 0, _len = m.length; _i < _len; _i++) {
+    tok = m[_i];
+    if (!tok.length) continue;
+>>>>>>> feature/temp-develop
     switch (state) {
       case 0: // token
         key= tok.trim();
         state= 1; // expect equals
         continue;
       case 1: // expect equals
+<<<<<<< HEAD
         if ('=' != tok) {return 'Equal sign was expected after '+key;}
+=======
+        if ('=' != tok) return 'Equal sign was expected after '+key;
+>>>>>>> feature/temp-develop
         state= 2;
         continue;
       case 2: // expect value
@@ -68,7 +91,11 @@ function parse_params(header) {
           return 'Unexpected token ('+tok+') after '+value+'"';
         }
       case 9: // expect commma
+<<<<<<< HEAD
         if (',' != tok) {return 'Comma expected after '+value;}
+=======
+        if (',' != tok) return 'Comma expected after '+value;
+>>>>>>> feature/temp-develop
         state= 0;
         continue;
     }
@@ -87,10 +114,17 @@ function parse_params(header) {
 
 function Parse_WWW_Authenticate(to_parse)
 {
+<<<<<<< HEAD
   const m= to_parse.match(ParseAuth);
   this.scheme= m[1];
   this.parms= {};
   const err= this.parse_params(m[2]);
+=======
+  var m= to_parse.match(ParseAuth);
+  this.scheme= m[1];
+  this.parms= {};
+  var err= this.parse_params(m[2]);
+>>>>>>> feature/temp-develop
   if (err) {
     this.scheme= '';
     this.parms= {};
@@ -102,7 +136,11 @@ function Parse_Authentication_Info(to_parse)
 {
   this.scheme= 'Digest';
   this.parms= {};
+<<<<<<< HEAD
   const err= this.parse_params(to_parse);
+=======
+  var err= this.parse_params(to_parse);
+>>>>>>> feature/temp-develop
   if (err) {
     this.scheme= '';
     this.parms= {};

lib/www-authenticate-patched/user-credentials.js

@@ -1,17 +1,27 @@
 /*
+<<<<<<< HEAD
 * Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved.
 */
 
 /*
+=======
+>>>>>>> feature/temp-develop
  * www-authenticate
  * https://github.com/randymized/www-authenticate
  *
  * Copyright (c) 2013 Randy McLaughlin
  * Licensed under the MIT license.
  */
 
+<<<<<<< HEAD
 
 const md5= require('./md5');
+=======
+/*
+* Copyright © 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved.
+*/
+var md5= require('./md5');
+>>>>>>> feature/temp-develop
 
 /*
  * Hide the password. Uses the password to form authorization strings,
@@ -25,6 +35,7 @@ function user_credentials(username,password,options) {
     return username;
   }
 
+<<<<<<< HEAD
   const basic_string= options && options.hide_basic ?
     ''
     :
@@ -33,25 +44,48 @@ function user_credentials(username,password,options) {
       :
         Buffer.from(username+':'+password, 'ascii').toString('base64')
       );
+=======
+  var basic_string= options && options.hide_basic ?
+    ''
+    :
+      (!password && password !== '' ?
+        Buffer.from(username, "ascii").toString("base64")
+      :
+        Buffer.from(username+':'+password, "ascii").toString("base64")
+      )
+>>>>>>> feature/temp-develop
   function Credentials()
   {
     this.username= username;
   }
   Credentials.prototype.basic= function()
   {
     return basic_string;
+<<<<<<< HEAD
   };
+=======
+  }
+>>>>>>> feature/temp-develop
   Credentials.prototype.digest= function(realm)
   {
     return !password && password !== '' ?
         md5(username+':'+realm)
         :
+<<<<<<< HEAD
         md5(username+':'+realm+':'+password);
   };
   Credentials.prototype.is_user_credentials= function()
   {
     return true;
   };
+=======
+        md5(username+':'+realm+':'+password)
+  }
+  Credentials.prototype.is_user_credentials= function()
+  {
+    return true;
+  }
+>>>>>>> feature/temp-develop
 
   return new Credentials;
 }