Dev to master v3.5

.gitignore

@@ -11,3 +11,4 @@ desktop.ini
 vendor/
 .bundle/
 .vscode/
+*.gem

.rubocop.yml

@@ -0,0 +1,7 @@
+inherit_mode:
+  merge:
+    - Exclude
+AllCops:
+  TargetRubyVersion: 2.3
+  NewCops: enable
+  SuggestExtensions: false

CHANGELOG.md

@@ -1,3 +1,11 @@
+### 3.5
+ - Improvements on powershell functions loading
+ - Improvements on gemspec file and in ruby code using Rubocop (Thanks noraj)
+ - Fixed issues with download and upload commands
+ - Added support for simple wildcard usage in upload and download commands
+ - Fixed non-controlled error on wrong certificates path when SSL enabled
+ - Docker image improved to support remote path completion
+
 ### 3.4
  - Added CI files to be used in Github actions for Docker automated building
  - Improvements on dynamic AMSI bypass

Dockerfile

@@ -1,7 +1,8 @@
 # Evil-WinRM Dockerfile
 
 # Base image
-FROM ruby:latest
+FROM alpine:3.14 AS final
+FROM alpine:3.14 AS build
 
 # Credits & Data
 LABEL \
@@ -13,14 +14,85 @@ LABEL \
 #Env vars
 ENV EVILWINRM_URL="https://github.com/Hackplayers/evil-winrm.git"
 
-# Install dependencies
-RUN gem install \
-    winrm \
+# Install dependencies for building ruby with readline and openssl support
+RUN apk --no-cache add cmake \
+    clang \
+    clang-dev \
+    make \
+    gcc \
+    g++ \
+    libc-dev \
+    linux-headers \
+    readline \
+    readline-dev \
+    yaml \
+    yaml-dev \
+    libffi \
+    libffi-dev \
+    zlib \
+    zlib-dev \
+    openssl-dev \
+    openssl \
+    bash
+
+# Make the ruby path available
+ENV PATH=$PATH:/opt/rubies/ruby-3.2.2/bin
+
+# Get ruby-install for building ruby 3.2.2
+RUN cd /tmp/ && \
+    wget -O /tmp/ruby-install-0.8.1.tar.gz https://github.com/postmodern/ruby-install/archive/v0.8.1.tar.gz && \
+    tar -xzvf ruby-install-0.8.1.tar.gz && \
+    cd ruby-install-0.8.1/ && make install && \
+    ruby-install -c ruby 3.2.2 -- --with-readline-dir=/usr/include/readline --with-openssl-dir=/usr/include/openssl --disable-install-rdoc
+
+# Evil-WinRM install method 1 (only one method can be used, other must be commented)
+# Install Evil-WinRM (DockerHub automated build process)
+RUN mkdir /opt/evil-winrm
+COPY . /opt/evil-winrm
+
+# Evil-WinRM install method 2 (only one method can be used, other must be commented)
+# Install Evil-WinRM (manual image build)
+# Uncomment git clone line and one of the ENV vars to select branch (master->latest, dev->beta)
+#ENV BRANCH="master"
+#ENV BRANCH="dev"
+#RUN git clone -b ${BRANCH} ${EVILWINRM_URL}
+
+# Install Evil-WinRM ruby dependencies
+RUN gem install winrm \
     winrm-fs \
     stringio \
     logger \
     fileutils
 
+# Clean and remove useless files
+RUN rm -rf /opt/evil-winrm/resources > /dev/null 2>&1 && \
+    rm -rf /opt/evil-winrm/.github > /dev/null 2>&1 && \
+    rm -rf /opt/evil-winrm/CONTRIBUTING.md > /dev/null 2>&1 && \
+    rm -rf /opt/evil-winrm/CODE_OF_CONDUCT.md > /dev/null 2>&1 && \
+    rm -rf /opt/evil-winrm/Dockerfile > /dev/null 2>&1 && \
+    rm -rf /opt/evil-winrm/Gemfile* > /dev/null 2>&1
+
+# Rename script name
+RUN mv /opt/evil-winrm/evil-winrm.rb /opt/evil-winrm/evil-winrm && \
+    chmod +x /opt/evil-winrm/evil-winrm
+
+# Base final image
+FROM final
+
+# Install readline and other dependencies
+RUN apk --no-cache add \
+    readline \
+    yaml \
+    libffi \
+    zlib \
+    openssl
+
+# Make the ruby and Evil-WinRM paths available
+ENV PATH=$PATH:/opt/rubies/ruby-3.2.2/bin:/opt/evil-winrm
+
+# Copy built stuff from build image
+COPY --from=build /opt /opt
+
 # Create volume for powershell scripts
 RUN mkdir /ps1_scripts
 VOLUME /ps1_scripts
@@ -33,32 +105,8 @@ VOLUME /exe_files
 RUN mkdir /data
 VOLUME /data
 
-# Set workdir
-WORKDIR /opt/
-
-#Evil-WinRM install method 1 (only one method can be used, other must be commented)
-#Install Evil-WinRM (Docker Hub automated build process)
-RUN mkdir evil-winrm
-COPY . /opt/evil-winrm
-
-#Evil-WinRM install method 2 (only one method can be used, other must be commented)
-#Install Evil-WinRM (manual image build)
-#Uncomment git clone line and one of the ENV vars to select branch (master->latest, dev->beta)
-#ENV BRANCH="master"
-#ENV BRANCH="dev"
-#RUN git clone -b ${BRANCH} ${EVILWINRM_URL}
-
-# Make script file executable
-RUN chmod +x evil-winrm/*.rb
-
-# Clean and remove useless files
-RUN rm -rf /opt/evil-winrm/resources > /dev/null 2>&1 && \
-    rm -rf /opt/evil-winrm/.github > /dev/null 2>&1 && \
-    rm -rf /opt/evil-winrm/CONTRIBUTING.md > /dev/null 2>&1 && \
-    rm -rf /opt/evil-winrm/CODE_OF_CONDUCT.md > /dev/null 2>&1 && \
-    rm -rf /opt/evil-winrm/Dockerfile > /dev/null 2>&1 && \
-    rm -rf /opt/evil-winrm/Gemfile* > /dev/null 2>&1 && \
-    rm -rf /tmp/* > /dev/null 2>&1
+# set current working dir
+WORKDIR /data
 
 # Start command (launching Evil-WinRM)
-ENTRYPOINT ["/opt/evil-winrm/evil-winrm.rb"]
+ENTRYPOINT ["evil-winrm"]

Gemfile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 source 'https://rubygems.org'
 
 gemspec

README.md

@@ -523,7 +523,7 @@ Use it at your own servers and/or with the server owner's permission.
 [@arale61]: https://twitter.com/arale61
 
 <!-- Badges URLs -->
-[Version-shield]: https://img.shields.io/badge/version-3.4-blue.svg?style=flat-square&colorA=273133&colorB=0093ee "Latest version"
+[Version-shield]: https://img.shields.io/badge/version-3.5-blue.svg?style=flat-square&colorA=273133&colorB=0093ee "Latest version"
 [Ruby2.3-shield]: https://img.shields.io/badge/ruby-2.3%2B-blue.svg?style=flat-square&colorA=273133&colorB=ff0000 "Ruby 2.3 or later"
 [License-shield]: https://img.shields.io/badge/license-LGPL%20v3%2B-blue.svg?style=flat-square&colorA=273133&colorB=bd0000 "LGPL v3+"
 [Docker-shield]: https://img.shields.io/docker/cloud/automated/oscarakaelvis/evil-winrm.svg?style=flat-square&colorA=273133&colorB=a9a9a9 "Docker rules!"

evil-winrm.gemspec

@@ -1,36 +1,37 @@
 # frozen_string_literal: true
 
 Gem::Specification.new do |spec|
-  spec.name = "evil-winrm"
-  spec.version = '3.4'
+  spec.name = 'evil-winrm'
+  spec.version = '3.5'
   spec.license = 'LGPL-3.0'
-  spec.authors = ["CyberVaca", "OscarAkaElvis", "Jarilaos", "Arale61"]
-  spec.email = ["oscar.alfonso.diaz@gmail.com"]
+  spec.authors = %w[CyberVaca OscarAkaElvis Jarilaos Arale61]
+  spec.email = ['oscar.alfonso.diaz@gmail.com']
 
-  spec.summary = "Evil-WinRM"
-  spec.description = "The ultimate WinRM shell for hacking/pentesting"
-  spec.homepage = "https://github.com/Hackplayers/evil-winrm#readme"
-  spec.required_ruby_version = ">= 2.3"
+  spec.summary = 'Evil-WinRM'
+  spec.description = 'The ultimate WinRM shell for hacking/pentesting'
+  spec.homepage = 'https://github.com/Hackplayers/evil-winrm#readme'
+  spec.required_ruby_version = '>= 2.3'
 
-  spec.metadata["homepage_uri"]    = spec.homepage
-  spec.metadata["source_code_uri"] = "https://github.com/Hackplayers/evil-winrm"
-  spec.metadata["changelog_uri"]   = "https://github.com/Hackplayers/evil-winrm/blob/master/CHANGELOG.md"
+  spec.metadata = {
+    'yard.run'              => 'yard',
+    'changelog_uri'         => 'https://github.com/Hackplayers/evil-winrm/blob/master/CHANGELOG.md',
+    'documentation_uri'     => 'https://rubydoc.info/gems/evil-winrm',
+    'homepage_uri'          => spec.homepage,
+    'source_code_uri'       => 'https://github.com/Hackplayers/evil-winrm',
+    'rubygems_mfa_required' => 'true'
+  }
 
-  spec.files = Dir.chdir(File.expand_path(__dir__)) do
-    `git ls-files -z`.split("\x0").reject do |f|
-      (f == __FILE__) || f.match(%r{\A(?:(?:bin|test|spec|features)/|\.(?:git|travis|circleci)|appveyor)})
-    end
-  end
+  spec.files = Dir['bin/*'] + ['evil-winrm.rb', 'LICENSE']
   spec.bindir = "bin"
   spec.executables = ["evil-winrm"]
 
-  spec.add_dependency "winrm",     "~> 2.3", ">= 2.3.2"
-  spec.add_dependency "winrm-fs",  "~> 1.3", ">= 1.3.2"
-  spec.add_dependency "stringio",  "~> 3.0"
-  spec.add_dependency "logger",    "~> 1.4", ">= 1.4.3"
-  spec.add_dependency "fileutils", "~> 1.0"
+  spec.add_dependency 'fileutils', '~> 1.0'
+  spec.add_dependency 'logger',    '~> 1.4', '>= 1.4.3'
+  spec.add_dependency 'stringio',  '~> 3.0'
+  spec.add_dependency 'winrm',     '~> 2.3', '>= 2.3.2'
+  spec.add_dependency 'winrm-fs',  '~> 1.3', '>= 1.3.2'
 
-  spec.add_development_dependency "bundler", "~> 2.0"
+  spec.add_development_dependency 'bundler', '~> 2.0'
 
-  spec.post_install_message = "Happy hacking! :)"
+  spec.post_install_message = 'Happy hacking! :)'
 end