From 3f616246076ea7eda72a3fabb445d46a7c6abaed Mon Sep 17 00:00:00 2001
From: Jort <MagicLegend@users.noreply.github.com>
Date: Mon, 23 Sep 2024 12:33:55 +0200
Subject: [PATCH] Revert "593 - Add Code of Ethics page and markdownify teams
 description"

---
 admin/config.yml                              | 19 +---------
 admin/development/config-dev.yml              | 19 +---------
 admin/staging/config-staging.yml              | 19 +---------
 .../what-we-do/code-of-ethics/_index.en.md    | 33 -----------------
 .../what-we-do/code-of-ethics/_index.nl.md    |  7 ----
 layouts/codeofethics/list.html                | 36 -------------------
 layouts/partials/footer.html                  |  3 --
 layouts/partials/mainnav.html                 |  8 -----
 static/.htaccess                              |  1 -
 9 files changed, 3 insertions(+), 142 deletions(-)
 delete mode 100644 content/what-we-do/code-of-ethics/_index.en.md
 delete mode 100644 content/what-we-do/code-of-ethics/_index.nl.md
 delete mode 100644 layouts/codeofethics/list.html

diff --git a/admin/config.yml b/admin/config.yml
index b5cbd2af..b207ac19 100644
--- a/admin/config.yml
+++ b/admin/config.yml
@@ -1049,23 +1049,6 @@ collections:
       - { label: "Title", name: "title", widget: "string", i18n: true }
       - { label: "Body", name: "body", widget: "markdown", i18n: true }
 
-  # PAGE: !Code of Ethics #####################################################
-  - name: codeofethics
-    label: "Code of ethics"
-    folder: "content/what-we-do/code-of-ethics"
-    slug: "_index"
-    create: false
-    i18n: true
-    fields:
-      - {
-          label: "type",
-          name: "type",
-          widget: "hidden",
-          value: "codeofethics",
-        }
-      - { label: "Title", name: "title", widget: "string", i18n: true }
-      - { label: "Body", name: "body", widget: "markdown", i18n: true }
-
   # PAGE: !Terms #####################################################
   - name: termsandconditions
     label: "Terms and Conditions"
@@ -1215,7 +1198,7 @@ collections:
           - { label: "type", name: "type", widget: "hidden", value: "team" }
           - label: "Description"
             name: "description"
-            widget: markdown
+            widget: "text"
             i18n: true
             required: false
           - label: "Members"
diff --git a/admin/development/config-dev.yml b/admin/development/config-dev.yml
index e919d346..4a1835c8 100644
--- a/admin/development/config-dev.yml
+++ b/admin/development/config-dev.yml
@@ -1049,23 +1049,6 @@ collections:
       - { label: "Title", name: "title", widget: "string", i18n: true }
       - { label: "Body", name: "body", widget: "markdown", i18n: true }
 
-  # PAGE: !Code of Ethics #####################################################
-  - name: codeofethics
-    label: "Code of ethics"
-    folder: "content/what-we-do/code-of-ethics"
-    slug: "_index"
-    create: false
-    i18n: true
-    fields:
-      - {
-          label: "type",
-          name: "type",
-          widget: "hidden",
-          value: "codeofethics",
-        }
-      - { label: "Title", name: "title", widget: "string", i18n: true }
-      - { label: "Body", name: "body", widget: "markdown", i18n: true }
-
   # PAGE: !Terms #####################################################
   - name: termsandconditions
     label: "Terms and Conditions"
@@ -1215,7 +1198,7 @@ collections:
           - { label: "type", name: "type", widget: "hidden", value: "team" }
           - label: "Description"
             name: "description"
-            widget: markdown
+            widget: "text"
             i18n: true
             required: false
           - label: "Members"
diff --git a/admin/staging/config-staging.yml b/admin/staging/config-staging.yml
index af0cbc75..c6bbf9d4 100644
--- a/admin/staging/config-staging.yml
+++ b/admin/staging/config-staging.yml
@@ -1049,23 +1049,6 @@ collections:
       - { label: "Title", name: "title", widget: "string", i18n: true }
       - { label: "Body", name: "body", widget: "markdown", i18n: true }
 
-  # PAGE: !Code of Ethics #####################################################
-  - name: codeofethics
-    label: "Code of ethics"
-    folder: "content/what-we-do/code-of-ethics"
-    slug: "_index"
-    create: false
-    i18n: true
-    fields:
-      - {
-          label: "type",
-          name: "type",
-          widget: "hidden",
-          value: "codeofethics",
-        }
-      - { label: "Title", name: "title", widget: "string", i18n: true }
-      - { label: "Body", name: "body", widget: "markdown", i18n: true }
-
   # PAGE: !Terms #####################################################
   - name: termsandconditions
     label: "Terms and Conditions"
@@ -1215,7 +1198,7 @@ collections:
           - { label: "type", name: "type", widget: "hidden", value: "team" }
           - label: "Description"
             name: "description"
-            widget: markdown
+            widget: "text"
             i18n: true
             required: false
           - label: "Members"
diff --git a/content/what-we-do/code-of-ethics/_index.en.md b/content/what-we-do/code-of-ethics/_index.en.md
deleted file mode 100644
index 2203687e..00000000
--- a/content/what-we-do/code-of-ethics/_index.en.md
+++ /dev/null
@@ -1,33 +0,0 @@
----
-type: codeofethics
-title: Code of Ethics
----
-## CODE OF ETHICS 0.1
-
-1. DIVD is a Dutch research institute that works with volunteers who aim to make the digital world safer by searching the internet for vulnerabilities and reporting the findings to those who can fix these vulnerabilities.
-2. As we work on sensitive data, gathered without informed consent, we established this Code of Conduct to provide an ethical base for the work we do. This code can also be used by other researchers working on what is currently referred to as responsible disclosure, or coordinated vulnerability disclosure.
-3. In our research projects we, for example:
-
-   * Scan the internet for vulnerabilities, mostly Common Vulnerabilities and Exposures (CVEs), and report our findings and possible solutions to the owners of these systems.
-   * Analyse online systems for new vulnerabilities (zero-days), report our findings to the makers and try to help them out in fixing the vulnerabilities.
-   * Analyse databases with leaked credentials and report to the organisations or people who are compromised to take appropriate measures.
-   * Work with trusted partners to extend our reach and notify as many organisations and people as possible
-4. We are aware that we operate at the edges of what is legally allowed, so we proceed by these three criteria commonly used in court cases on vulnerability disclosures:
-
-   * Societal need: we do vulnerability disclosure to prevent online damage to as many internet users as possible and don’t serve any particular financial, political or individual interests.
-   * Principle of Proportionality: we serve this need with appropriate means. Our research should increase and not decrease the integrity and availability of online systems.
-   * Principle of Subsidiarity: if several means are available to meet the need, we opt for the one which has the least impact.
-5. We validate our findings to prevent reporting false positives or miss false negatives and sometimes need to verify if a vulnerability is actually present. We use custom-made scripts based on publicly available proof of concepts or non-weaponized exploit code and take good care that we don’t damage systems, download too much personal data, or create backdoors.
-6. Our findings typically consist of lists with several to millions of IP addresses, the type of vulnerability found, contact information, and metadata (e.g. timestamps, scripts, researchers working on the data). This is sensitive data, so we take all precautions necessary to protect the confidentiality of this data.
-7. We disclose zero-day vulnerabilities to the vendor first, then request CVE numbers and negotiate a reasonable time span for disclosing it to our Trusted Information Sharing Partners and the broader public. Ideally, the disclosure is preceded by a patch. If a vendor is obviously slow in providing the patch and it is likely others may discover and abuse the vulnerability, we may consider disclosure to warn potential victims and advise them on mitigation measures.
-8. We report the CVEs we find to the owners of the systems, mostly by generating email addresses based on their domain name, such as info@, security@ or abuse@ and to the listed abuse addresses of IP owners. We may also send them our findings through our Trusted Information Sharing Partners, who are, for example, Computer Emergency Response Teams, Computer Security Incident Response Teams, Internet Service Providers, governmental organisations or other research institutes.
-9. We analyse online threats, not threat actors. We are researchers and don’t serve the needs of governments or law enforcement.
-10. After reporting our findings, we repeat our scans to track progress. We, therefore, need to store data and log our activities. We may also need this data in case of a dispute. We minimize the amount of personal data we gather and store and are aware that an IP address can also be perceived as information relating to an identified or identifiable natural person. We believe that our processing of this data is proportional to our aim to protect much more sensitive personal data in the systems at stake.
-11. During our research, we inform the broader security community and the media about our findings only on a statistical basis: just numbers, no names, or other identifiable information. We close all research projects with a report, which can be downloaded from divd.nl and is under Creative Commons Licence.
-12. We only report vulnerable systems. Patching or other mitigation is solely the responsibility of the owner.
-13. DIVD is responsible for making researchers aware of these rules, while it is the responsibility of each researcher to stick to them. If they don’t, the board will take appropriate measures, for instance by revoking their DIVD account.
-14. This Code of Conduct will also be used as an ethical guidance for our DIVD Academy, shared with the broader security community and updated regularly. Suggestions and feedback are welcome. Contact our ethical committee [ethics@divd.nl](mailto:ethics@divd.nl)
-
-## MORE INFO:
-
-Is it legit to exchange lists of IP addresses together with vulnerabilities? The short answer is: Yes, according to Dutch law we can. The more elaborate answer you will find in this Liability Impact Assessment, prepared by Privacy Management Partners (in Dutch). [Click here to download](/documents/LIA_abuse_informatie_v1.1.pdf) (Dutch)
\ No newline at end of file
diff --git a/content/what-we-do/code-of-ethics/_index.nl.md b/content/what-we-do/code-of-ethics/_index.nl.md
deleted file mode 100644
index 317992fe..00000000
--- a/content/what-we-do/code-of-ethics/_index.nl.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-type: codeofethics
-title: Code of Ethics
----
-# Hello world
-
-code of ethics NL
\ No newline at end of file
diff --git a/layouts/codeofethics/list.html b/layouts/codeofethics/list.html
deleted file mode 100644
index 14298fb9..00000000
--- a/layouts/codeofethics/list.html
+++ /dev/null
@@ -1,36 +0,0 @@
-
-
-
-{{ define "main" }}
-
-
-
-<div class="article-layout">
-  {{ partial "breadcrumbs" . }}
-
-  {{ partial "p/section_open" (dict "classes" (slice "article" ))}} 
-
-    {{ partial "p/layout_open" (dict "classes" (slice "article" "has-image")) }}
-      
-      
-        <div class="image-header">
-          {{ with resources.Get "images/global/codeofconduct_header.png" }} 
-            {{ partial "tools/rimg/img" (dict "img" . "alt" "Code of ethics") }}
-          {{ end }}
-        </div>
-      
-
-      <div class="article-body">
-        <article>
-          {{ .Content }}
-        </article>
-        <aside>
-        
-        </aside>
-      </div>
-    {{ partial "p/layout_close" }}
-
-  {{ partial "p/section_close" }}
-</div>
-
-{{ end }}
\ No newline at end of file
diff --git a/layouts/partials/footer.html b/layouts/partials/footer.html
index 291f4e4f..8b44bedf 100644
--- a/layouts/partials/footer.html
+++ b/layouts/partials/footer.html
@@ -37,9 +37,6 @@ <h4>{{ i18n "security" }}</h4>
               <li>
                 <a href="{{ "what-we-do/code-of-conduct/" | relLangURL }}">{{ i18n "codeofconduct" }}</a>
               </li>
-              <li>
-                <a href="{{ "what-we-do/code-of-ethics/" | relLangURL }}">{{ i18n "codeofethics" }}</a>
-              </li>
               <li>
                 <a href="{{ "security/" | relLangURL }}">{{ i18n "securitypolicy" }}</a>
               </li>
diff --git a/layouts/partials/mainnav.html b/layouts/partials/mainnav.html
index f5cefdc9..c3a21f39 100644
--- a/layouts/partials/mainnav.html
+++ b/layouts/partials/mainnav.html
@@ -24,11 +24,6 @@
         {{ i18n "nav_security" }}
         {{ partial "svg/icon" "chevrondown" }}
       </a>
-
-      <a href="{{ "/what-we-do/code-of-ethics" | relLangURL }}">
-        {{ i18n "nav_security" }}
-        {{ partial "svg/icon" "chevrondown" }}
-      </a>
     </article>
 
     <aside>
@@ -119,9 +114,6 @@ <h3>Security</h3>
             <li>
               <a href="{{ "/what-we-do/code-of-conduct" | relLangURL }}">Code of Conduct</a>
             </li>
-            <li>
-              <a href="{{ "/what-we-do/code-of-ethics" | relLangURL }}">Code of Ethics</a>
-            </li>
             <li>
               <a href="{{ "/why-our-work-matters" | relLangURL }}">Why our work matters</a>
             </li>
diff --git a/static/.htaccess b/static/.htaccess
index 76cb30ed..e2451288 100644
--- a/static/.htaccess
+++ b/static/.htaccess
@@ -40,7 +40,6 @@ RewriteRule .* /contribute/#donate [NE,L,r=301,QSA]
 
 RewriteCond %{REQUEST_URI} ^/divd-nl-2024/code [NC]
 RewriteRule .* /what-we-do/code-of-conduct/ [L,r=301,QSA]
-RewriteRule .* /what-we-do/code-of-ethics/ [L,r=301,QSA]
 
 RewriteCond %{REQUEST_URI} ^/divd-nl-2024/join [NC]
 RewriteRule .* /contribute/volunteers/ [L,r=301,QSA]
\ No newline at end of file