From f24693b672c60fc3b149ae9623accf283161168d Mon Sep 17 00:00:00 2001
From: Bill Church <billchurch@users.noreply.github.com>
Date: Fri, 23 Aug 2024 00:55:28 +0000
Subject: [PATCH] chore: update test server

---
 ChangeLog.md                                  |  5 ++
 tests/servers/keyboard-interactive/Dockerfile | 12 +++--
 tests/servers/keyboard-interactive/README.md  |  4 +-
 .../keyboard-interactive/color-test.sh        | 28 ++++++++++
 .../servers/keyboard-interactive/orthrus2.sh  | 52 +++++++++++++++++++
 5 files changed, 95 insertions(+), 6 deletions(-)
 create mode 100644 tests/servers/keyboard-interactive/color-test.sh
 create mode 100644 tests/servers/keyboard-interactive/orthrus2.sh

diff --git a/ChangeLog.md b/ChangeLog.md
index 779f569..9ce29f4 100644
--- a/ChangeLog.md
+++ b/ChangeLog.md
@@ -2,6 +2,11 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+<a name="0.2.20"></a>
+## [0.2.20](https://github.com/billchurch/WebSSH2/compare/v0.2.19...v0.2.20) (2024-08-22)
+
+
+
 <a name="0.2.19"></a>
 ## [0.2.19](https://github.com/billchurch/WebSSH2/compare/v0.2.18...v0.2.19) (2024-08-22)
 
diff --git a/tests/servers/keyboard-interactive/Dockerfile b/tests/servers/keyboard-interactive/Dockerfile
index 07a2fb5..c9eb9a0 100644
--- a/tests/servers/keyboard-interactive/Dockerfile
+++ b/tests/servers/keyboard-interactive/Dockerfile
@@ -3,8 +3,8 @@ FROM debian:bullseye-slim
 
 # Install the necessary packages
 RUN apt-get update && \
-    apt-get install -y --no-install-recommends \
-    openssh-server && \
+apt-get install -y --no-install-recommends \
+openssh-server htop mc sudo bash bash-completion readline-common && \
     apt-get clean && \
     rm -rf /var/lib/apt/lists/*
 
@@ -16,12 +16,16 @@ RUN mkdir /var/run/sshd && \
     echo 'UsePAM yes' >> /etc/ssh/sshd_config && \
     echo 'AuthenticationMethods keyboard-interactive' >> /etc/ssh/sshd_config
 
+COPY --chmod=755 orthrus2.sh /etc/profile.d/ascii-art.sh
+
 # Add a test user with a password
-RUN useradd -m testuser && \
+RUN useradd -m -s /bin/bash testuser && \
     echo "testuser:testpassword" | chpasswd
 
+COPY --chown=testuser:testuser --chmod=755 color-test.sh /home/testuser/color-test.sh
+
 # Expose port 4444
 EXPOSE 4444
 
 # Start the SSH server
-CMD ["/usr/sbin/sshd", "-D", "-e", "-d", "-d", "-d"]
\ No newline at end of file
+CMD ["/usr/sbin/sshd", "-D", "-e"]
\ No newline at end of file
diff --git a/tests/servers/keyboard-interactive/README.md b/tests/servers/keyboard-interactive/README.md
index dc42f34..68e6fd9 100644
--- a/tests/servers/keyboard-interactive/README.md
+++ b/tests/servers/keyboard-interactive/README.md
@@ -11,7 +11,7 @@ FROM debian:bullseye-slim
 
 # Install the necessary packages
 RUN apt-get update && \
-    apt-get install -y --no-install-recommends \
+    apt-get install htop -y --no-install-recommends \
     openssh-server && \
     apt-get clean && \
     rm -rf /var/lib/apt/lists/*
@@ -32,7 +32,7 @@ RUN useradd -m testuser && \
 EXPOSE 4444
 
 # Start the SSH server
-CMD ["/usr/sbin/sshd", "-D", "-e", "-d -d -d"]
+CMD ["/usr/sbin/sshd", "-D", "-e"]
 ```
 
 ### Instructions:
diff --git a/tests/servers/keyboard-interactive/color-test.sh b/tests/servers/keyboard-interactive/color-test.sh
new file mode 100644
index 0000000..d2c0cdf
--- /dev/null
+++ b/tests/servers/keyboard-interactive/color-test.sh
@@ -0,0 +1,28 @@
+#!/bin/bash
+
+# Print 256-color test pattern in xterm-256color terminal
+echo -e "\n256 Color Test Pattern\n"
+
+# Colors 0-15: Standard colors
+echo -e "Standard colors:"
+for i in {0..15}; do
+  printf "\e[48;5;${i}m%4s\e[0m" "$i"
+done
+echo -e "\n"
+
+# Colors 16-231: Color cube
+echo -e "Color cube:"
+for i in {16..231}; do
+  printf "\e[48;5;${i}m%4s\e[0m" "$i"
+  if (( (i - 15) % 6 == 0 )); then
+    echo
+  fi
+done
+echo -e "\n"
+
+# Colors 232-255: Grayscale
+echo -e "Grayscale colors:"
+for i in {232..255}; do
+  printf "\e[48;5;${i}m%4s\e[0m" "$i"
+done
+echo -e "\n"
\ No newline at end of file
diff --git a/tests/servers/keyboard-interactive/orthrus2.sh b/tests/servers/keyboard-interactive/orthrus2.sh
new file mode 100644
index 0000000..97f73e7
--- /dev/null
+++ b/tests/servers/keyboard-interactive/orthrus2.sh
@@ -0,0 +1,52 @@
+#!/bin/bash
+
+echo -e "\e[31m"
+cat << 'EOF'
+                                                                                           
+                                                                                           
+     .,:;i;:,.          ,sr;:,:;rs;.          .,:;;:,.                                     
+   .iA33333332s:.      .X3535555555.       .:rsXssssssr,                                   
+  .Ah5Ar;:;sXXAAsiirrrr:s222222222A,;iiiriirri;;,,,:;irXi.                                 
+ .A5si;,:,,iA5MGSGMh333riA2AAAAA2Ar,rrrsX2M#Gh2r:,,.,::;s:.                                
+ :Asrr:.;2G&&@&M3Ar2555A:sAAAAAAXs::iiii:;iXH&&&B5i..:;;;r.                                
+.;sr;, ,AsihB9h55Ar;:is5r;sXXXXsr;,i;;,,;;iisS#Ssi;:..,:;;,         ,;rsXAsi,.             
+ .,.   ;rs.i9S55Ais..,Xr5i:rriii:,;:si..ii;iiM92.ir:.  ....      .i5G99#3r:,.              
+       :s2.i#S35rXX..:HsA2r:,..,:;i;MA,.X5:irG#A sA,.       .,  :hB9#Ghi.                  
+   ..,:iXh2M9#H5XXMXsMHs222Xri;;iii;3#h3H5;r399S2hAi:,..    rM,;S9SSG3X.                   
+ .:rrrsrsASB999G3A2332XA2222Ariiiiii;sA2siXM999BHAXXssrr;. .A9i5#GGG522:                   
+ ,:.......29#####GMh3522222AAriiiiiiirXA5M#####9r.......::  r#3MSGGh2222i.                 
+ ,5;,.,,i2SSSSSSSSH5MGh2AAAAAAi;ii;i2H33GSSSSSSSHX;,..,;5r  ,3SGGGGh22AA52r,  :.           
+ .XGhs5H#SGGGGGSSM2AhHH32AAA25Ariir2HM3AAHSSSGGGS#SM2shMh,   ,2HHHHH5AAAA222s:s3,          
+  .r5AiXA23hhh32AX5hh3552A253Gh2AA22553h2XA53hMh32AXrX5A:.    .i23hhh5AAAAAA22XhA.         
+   .::X2AAXXXXXAA2Xsri;iX223HGGh22AriirsXAAXXXXXXXA22;:.     ..;rrX2252XssssXXA55:,,       
+     ..:issssri:,,..,;s2523HGGGGh222X;,...,:;irsssr;,.        .,;rrsssXAAsrssssX2iss.      
+         .... .;:,isA25223HGGGGGGh2222Asr,,i;  ...                .....,XXrsssrXAr2r.      
+              :32XA522223HGHHHHGGGh22222AXA55.                          iXrrrrrXAA2:       
+             .535522225hHHHHHHHHHGGh522222223r                        .;srrrrrsAA2i.       
+            .s32222255hHHHHHHHHHHHHHM522225Xss..     ....,,,,,.. ..,:issiiiiirA2A;.        
+            ,sA555553MHHHHHHHHGHHHHHHh52222i;rXXssssXA2255555535XirrrriiiiirXAArii,        
+            .,2A553hHHHHHHHHGH3HHHHMMM5A2ArssXXXA255552222225GS###MA;irrssXA2AXXs;.        
+             .;;23hHHHHHHMHH3shGHh5533ssssXXXXXXsssXAAAAAAA5GGGGHHG#Hsr2222Asr;,.          
+              .irA2XHHMHhh3A;Ah2XX2hM3AAA252AXXXssssssXXXX2HGH5ssrsAM#X;sirrr;.            
+              ;#5sssAhMMh2A3AsXA3HGGM225MMhMhAXsssssssssX2MHG2rrrs2AA5Gs.. ..              
+             .5#HMhh2A5hhhMHHMHHGGGH522HMAAAM2Xsssssssss2MHHMsrrsMAiiiX3:                  
+             .MGHHHMMMhhMMMMMh5HHHGH222H3AXAhAXrssssssXA5hHHMsrrsH5riirsX.                 
+             .MGHH53MMMM5MMMM2sGHHHH5AA5Mh332XsissssXA22A2HHH2irrX33AXri5,                 
+             .3GHMXA53hhX23352ihHHHHM2AAA2AAXAsrAAAA222AXsHMMHAriirrrris3;                 
+             .rGMM5rrs522A2222srMHMHHH35222222rA222222222i3MMMH3AsrrsX253i                 
+              .2HM32s;rA22222A2rrhMMMMHHMMMh2XrXrX22AXsi;,iMMMMMMMhhhMh35s                 
+               :MMM32Ar:;rXsXAA2rrMMMMMMMMMh5AAXiir;,...:,.rhMhMMMMhhh3522.                
+               .AHMM322s:..,.,:;i,XMMMMMMMMh5AXri......,r, .i5hhhhhhh332A2X,               
+                iHMMh5AAXsrir,    ,hMMMMMMh32AXs;.,,,:;iA,  .:s25333352AAA22r;:.           
+                :MMhMh2AAAAXi.    .AMMMMMMM322i;;iirrrssAs,.. .:rXA222AAAAAA222,           
+                ,3Mhhh5AAAA::.    .sHMMMMMM322;:isXXXXXXXAAA;   ..,;rAAAAAAAAAX.           
+                .3Mhhh3AAAA.       iMMMMMMh5A2: .,;rXXXXXXX2;       .XAAAAAAA2r.           
+                .3Mhhh32AAX.       iMhhhhhh5A2,    :XXXXXXAA,       .XAAAAAAA2;.           
+                ,hhhhh5AA2r.       iMhhhhh322A.   .;XXXXXXAs.       ,A55522AA2:            
+                ;Mhhh35AA2;.      .sMhhhhh5A2s.   .sXXXXXX2;.       :333332AAA.            
+            .. .2hhh332AAA,     ..,23hhhh32A2i ...;XXXXXXXA,      ..s33h332AAs.            
+         .:s5XsA2A23h5AAAr. .;ir53XX22A535AA2;;iiirssXXXXAr.  ,;i22rA2AA55AX2;.            
+        :X2SA2GMh35A2AAAA, .sGsHSXAHMh322AAAX;siXXXXXXXXAX,  ,2XGHs3Hh32AAXAX.             
+       .;isAisAAAAAAAAAs:. .rA;A2is22AAAAAAX;rrrXXXXAAXXs:.  :XiAA;XAAAAAAXs,.             
+EOF
+echo -e "\e[0m"