update for release

.gitignore

@@ -26,6 +26,7 @@ docs/book/_build/
 .project
 .pydevproject
 docs/site/
+web/cuckoo/web/static/docs/
 
 # Python package stuff
 .eggs/

common/setup.py

@@ -21,7 +21,7 @@
         "Intended Audience :: Information Technology",
         "Intended Audience :: Science/Research",
         "Natural Language :: English",
-        "License :: OSI Approved :: GNU General Public License v3 (GPLv3)",
+        "License :: OSI Approved :: European Union Public Licence 1.2 (EUPL 1.2)",
         "Operating System :: POSIX :: Linux",
         "Programming Language :: Python :: 3.6",
         "Programming Language :: Python :: 3.7",

core/setup.py

@@ -30,7 +30,7 @@
         "Intended Audience :: Information Technology",
         "Intended Audience :: Science/Research",
         "Natural Language :: English",
-        "License :: OSI Approved :: GNU General Public License v3 (GPLv3)",
+        "License :: OSI Approved :: European Union Public Licence 1.2 (EUPL 1.2)",
         "Operating System :: POSIX :: Linux",
         "Programming Language :: Python :: 3.6",
         "Programming Language :: Python :: 3.7",

docs/mkdocs.yml

@@ -1,5 +1,5 @@
-site_name: Cuckoo docs
-site_url: https://example.com/
+site_name: Cuckoo 3 docs
+site_url: https://cuckoo-hatch.cert.ee/static/docs/
 theme:
   name: readthedocs
   highlightjs: true
@@ -13,19 +13,19 @@ plugins:
 docs_dir: src
 nav:
 - Introduction:
-  - Cuckoo: introduction/cuckoo.md
+  - Cuckoo 3: introduction/cuckoo.md
   - Sandboxing: introduction/sandboxing.md
 
 - Installation:
-  - Cuckoo installation: installation/cuckoo.md
+  - Cuckoo 3 installation: installation/cuckoo.md
   - System dependencies: installation/deps.md
   - Machinery modules: installation/machineries.md
   - VM Creation: installation/vmcreation.md
   - Network routing: installation/routing.md
 
 - Configuration:
   - System settings: configuration/system.md
-  - Cuckoo configuration:
+  - Cuckoo 3 configuration:
     - Cuckoo.yaml: configuration/cuckooconfs/cuckooyaml.md
     - Distributed.yaml: configuration/cuckooconfs/distributedyaml.md
     - Web configuration:
@@ -40,4 +40,4 @@ nav:
     - Setup: usage/webapi/setup.md
     - Endpoints: usage/webapi/endpoints.md
   - Web UI: usage/webui/setup.md
-  - Commands: usage/commands.md 
+  - Commands: usage/commands.md

docs/src/introduction/cuckoo.md

@@ -1,4 +1,4 @@
-# What is Cuckoo?
+# What is Cuckoo 3?
 
 Cuckoo 3 is a Python 3 open source automated malware analysis system.
 
@@ -19,4 +19,3 @@ The recommended Python versions are 3.6 or 3.8. Lower than 3.6 will not work.
 - Windows 10 (Build 1703)
   - Stager: Tmstage
   - Monitor: Threemon
-

install.sh

@@ -1,28 +1,9 @@
 #!/bin/bash
 
-if ! [[ -d "../deps" ]];
-then
-  echo "../deps does not exist"
-  exit 1
-fi
-
-
 # TMP solution until new versions of sflock etc are released to PyPI
-declare -a deplist=("../deps/sflock" "../deps/roach" "../deps/httpreplay")
-
-for dep in ${deplist[@]}
-do
-  if ! [[ -d "$dep" ]]; then
-    echo "Missing dependecy: $dep"
-    exit 1
-  fi
-
-  pip install -e "$dep"
-  if [ $? -ne 0 ]; then
-      echo "Install of $dep failed"
-      exit
-  fi
-done
+pip install -U git+https://github.com/cert-ee/sflock
+pip install -U git+https://github.com/cert-ee/roach
+pip install -U git+https://github.com/cert-ee/httpreplay
 
 pip install -U requests
 
@@ -40,4 +21,4 @@ do
       echo "Install of $pkg failed"
       exit 1
   fi
-done
+done

machineries/setup.py

@@ -21,7 +21,7 @@
         "Intended Audience :: Information Technology",
         "Intended Audience :: Science/Research",
         "Natural Language :: English",
-        "License :: OSI Approved :: GNU General Public License v3 (GPLv3)",
+        "License :: OSI Approved :: European Union Public Licence 1.2 (EUPL 1.2)",
         "Operating System :: POSIX :: Linux",
         "Programming Language :: Python :: 3.6",
         "Programming Language :: Python :: 3.7",

node/setup.py

@@ -25,7 +25,7 @@
         "Intended Audience :: Information Technology",
         "Intended Audience :: Science/Research",
         "Natural Language :: English",
-        "License :: OSI Approved :: GNU General Public License v3 (GPLv3)",
+        "License :: OSI Approved :: European Union Public Licence 1.2 (EUPL 1.2)",
         "Operating System :: POSIX :: Linux",
         "Programming Language :: Python :: 3.6",
         "Programming Language :: Python :: 3.7",

processing/setup.py

@@ -21,7 +21,7 @@
         "Intended Audience :: Information Technology",
         "Intended Audience :: Science/Research",
         "Natural Language :: English",
-        "License :: OSI Approved :: GNU General Public License v3 (GPLv3)",
+        "License :: OSI Approved :: European Union Public Licence 1.2 (EUPL 1.2)",
         "Operating System :: POSIX :: Linux",
         "Programming Language :: Python :: 3.6",
         "Programming Language :: Python :: 3.7",
@@ -41,7 +41,7 @@
         "httpreplay>=1.0, <1.1",
         "pefile>=2019.4.18, <2019.5.0",
         "oletools>=0.60, <0.61",
-        "cryptography>=3.2, <3.3",
+        "cryptography>=3.3.2, <3.4",
         "hyperscan>=0.1.5, <0.2",
         "yara-python>=4.0.2, <4.1",
         "roach>=1.0, <1.1",

web/cuckoo/web/templates/partial/footer.html.jinja2

@@ -1,14 +1,9 @@
 <footer class="footer">
-  <div class="footer-start columns is-center is-vcenter">
-    <!-- <div class="logo has-text-center">
-      <span class="logo-placeholder is-embossed is-big"></span>
-    </div> -->
-  </div>
   <div class="footer-end">
-    <p><strong>&copy; 2021</strong></p>
+    <p><strong>&copy; 2021 Estonian Information System Authority</strong></p>
     <ul class="list is-horizontal">
       <li>
-        <a class="is-link has-no-underline" href="/">
+        <a class="is-link has-no-underline" href="/static/docs/">
           <span class="icon">
             <i class="fas fa-book"></i>
           </span>
@@ -45,4 +40,7 @@
       <a class="is-link has-no-underline" href="#">Back to top</a>
     </div>
   </div>
+  <div class="footer-start columns is-center is-vcenter">
+    <img src="/static/images/cef_logo_2.png" alt="CEF logo" width="448" height="79"/>
+  </div>
 </footer>

web/cuckoo/web/templates/partial/navbar.html.jinja2

@@ -9,7 +9,7 @@
 <nav class="navbar">
   <div class="navbar-logo">
     <a class="navbar-link" href="/analyses">
-      <span class="logo-placeholder"></span>
+      <img src="/static/images/logo.png" alt="Cuckoo3" />
     </a>
     <a class="navbar-toggle" title="Expand menu">
       <span></span>

web/setup.py

@@ -21,7 +21,7 @@
         "Intended Audience :: Information Technology",
         "Intended Audience :: Science/Research",
         "Natural Language :: English",
-        "License :: OSI Approved :: GNU General Public License v3 (GPLv3)",
+        "License :: OSI Approved :: European Union Public Licence 1.2 (EUPL 1.2)",
         "Operating System :: POSIX :: Linux",
         "Programming Language :: Python :: 3.6",
         "Programming Language :: Python :: 3.7",