Merge pull request #35 from Hugo-C/feature/GH-32

Feature/gh 32 Add shodan integration
Hugo-C · Aug 19, 2023 · 491a8f6 · 491a8f6
2 parents 4c7e562 + ac81577
commit 491a8f6
Show file tree

Hide file tree

Showing 15 changed files with 1,826 additions and 11,169 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -12,7 +12,7 @@ serde = { version = "1.0", features = ["derive"] }
 lazy_static = "1.4"
 regex = "1.7"
 csv = "1.2"
-openssl = { version = "0.10", features = ["vendored"] }  # Required for sentry
+openssl = { version = "~0.10.55", features = ["vendored"] }  # Required for sentry
 sentry = "0.31"
 rocket-sentry = "0.7"  # 0.8 require rocket 0.5
 
@@ -22,4 +22,4 @@ default-features = false
 features = ["json"]
 
 [dev-dependencies]
-rstest = "0.17"
+rstest = "0.18"
diff --git a/README.md b/README.md
@@ -7,7 +7,9 @@ The GUI is made with Vue.js with the future goal to store previously computed ha
 
 # Live version: [jarm.online](https://jarm.online/)  
 [![Website](https://img.shields.io/website?down_color=lightgrey&style=for-the-badge&up_color=brightgreen&up_message=online&url=https%3A%2F%2Fjarm.online%2F)](https://jarm.online/)  
-[![Docker publish](https://github.com/Hugo-C/jarm-online/actions/workflows/docker-publish.yml/badge.svg)](https://github.com/Hugo-C/jarm-online/actions/workflows/docker-publish.yml)
+[![Docker publish](https://github.com/Hugo-C/jarm-online/actions/workflows/docker-publish.yml/badge.svg)](https://github.com/Hugo-C/jarm-online/actions/workflows/docker-publish.yml)  
+[![dependency status](https://deps.rs/repo/github/Hugo-C/jarm-online/status.svg)](https://deps.rs/repo/github/Hugo-C/jarm-online)
+
 </div>
 
 ## Setup

diff --git a/jarm_online_gui/Dockerfile b/jarm_online_gui/Dockerfile
@@ -1,5 +1,5 @@
 # Taken from https://cli.vuejs.org/guide/deployment.html#docker-nginx
-FROM node:16.20 as build-stage
+FROM node:18 as build-stage
 ARG VUE_APP_SENTRY_DSN
 RUN echo "Sentry dsn set to $VUE_APP_SENTRY_DSN"
 WORKDIR /app

diff --git a/jarm_online_gui/README.md b/jarm_online_gui/README.md
@@ -7,7 +7,7 @@ npm install
 
 ### Compiles and hot-reloads for development
 ```
-npm run serve
+npm run dev
 ```
 
 ### Compiles and minifies for production
@@ -21,4 +21,4 @@ npm run lint
 ```
 
 ### Customize configuration
-See [Configuration Reference](https://cli.vuejs.org/config/).
+See [Configuration Reference](https://vitejs.dev/config/).
diff --git a/jarm_online_gui/babel.config.js b/jarm_online_gui/babel.config.js
diff --git a/jarm_online_gui/public/index.html → jarm_online_gui/index.html b/jarm_online_gui/public/index.html → jarm_online_gui/index.html
@@ -5,14 +5,14 @@
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="viewport" content="width=device-width,initial-scale=1.0">
       <meta name="description" content="Compute jarm hash online with this cybersecurity tool. List of malicious hashes included. Disclaimer: results are saved in database">
-    <link rel="icon" href="<%= BASE_URL %>favicon.ico">
-    <title><%= htmlWebpackPlugin.options.title %></title>
+    <link rel="icon" href="/favicon.ico">
+    <title>Jarm online</title>
   </head>
   <body>
     <noscript>
-      <strong>We're sorry but <%= htmlWebpackPlugin.options.title %> doesn't work properly without JavaScript enabled. Please enable it to continue.</strong>
+      <strong>We're sorry but this app doesn't work properly without JavaScript enabled. Please enable it to continue.</strong>
     </noscript>
     <div id="app"></div>
-    <!-- built files will be auto injected -->
+    <script type="module" src="/src/main.js"></script>
   </body>
 </html>