1 files changed, 113 insertions, 40 deletions

diff --git a/template/gsoc.html.j2 b/template/gsoc.html.j2
index 5a8066f4..6fdc58be 100644
--- a/template/gsoc.html.j2
+++ b/template/gsoc.html.j2
@@ -9,8 +9,8 @@
   <div class="row">
     <div class="col-2 d-none d-lg-block"><!-- for large viewports show menu for better orientation -->
       <nav class="nav subnav position-fixed flex-column border-right" style="position:fixed">
-      <a class="nav-link" href="#current">{{ _("Ideas 2020") }}</a>
-      <a class="nav-link" href="#past">{{ _("Past projects") }}</a>
+      <a class="nav-link" href="#current">{{ _("Ideas 2021") }}</a>
+      <!--<a class="nav-link" href="#past">{{ _("Past projects") }}</a>-->
       <a class="nav-link" href="#finished">{{ _("Finished projects") }}</a>
       </nav>
     </div>
@@ -26,7 +26,85 @@
       </section>
 
 
-      <h2><a name="current" class="subnav-anchor"></a>{{ _("Ideas 2020") }}</h2>
+      <h2><a name="current" class="subnav-anchor"></a>{{ _("Ideas 2021") }}</h2>
+
+      <section>
+        <h4>Transport Next Generation (TNG): Communicator plugins</h4>
+        <p>
+          {% trans %}
+            The GNUnet team is currently working on a transport layer rewrite
+            in order to fix core issues with connectivity.
+            This new component is currently developed under the name "TNG".
+            What is currently known as "transport plugins" will in the TNG
+            be represented as "communicators".
+
+            Communicators are processes with a well defined API that allow
+            to connect peers over a specific protocol.
+            The primary protocol which are already implemented are UNIX sockets,
+            UDP sockets, and TCP sockets.
+
+            For a truly resilient network, other connectivity options such as
+            WiFi mesh, Bluetooth, HTTP(S), QUIC or even more obscure alternatives
+            such as radio are required.
+
+            In this project, the goal is to select, implement and test new
+            communicators.
+            While TNG is not yet ready, communicators can, by design, be developed
+            and tested against the current API.
+
+            We expect that this project can be worked on by multiple students
+            as there are a lot of protocols to choose from.
+            The tasks would consist of:
+            <ol>
+              <li>Deciding which communicators to implement.</li>
+              <li>Test the communicators.</li>
+              <li>Documentation.</li>
+            </ol>
+            Advantageous skills/languages/frameworks:
+            <ol>
+              <li>C</li>
+              <li>Knowledge of HTTPS, QUIC, Bluetooth or WiFi.</li>
+            </ol>
+            <br/>
+            <strong>Difficulty:</strong> Average, but depends on selected protocols.
+            <br/>
+            <strong>Mentors:</strong> Martin Schanzenbach, t3sserakt
+          {% endtrans %}
+        </p>
+      </section>
+
+      <section>
+        <h4>REST: Multi-user support</h4>
+        <p>
+          {% trans %}
+            The REST API currently only supports a single user system.
+            This is an issue as on multi-user systems, access control
+            must be enfoced on a per-user basis.
+
+            In this project, the REST service must be extended to
+            support user authentication.
+            This includes the correct handling of user context switches.
+            <ol>
+              <li>Implement user authentication.</li>
+              <li>Test the access control.</li>
+              <li>Document the changes to the REST API.</li>
+            </ol>
+            Advantageous skills/languages/frameworks:
+            <ol>
+              <li>C</li>
+              <li>Knowledge of user authentication subsystems on Linux/Unix.</li>
+              <li>REST/HTTP Authentication methods</li>
+            </ol>
+            <br/>
+            <strong>Difficulty:</strong> Beginner
+            <br/>
+            <strong>Mentors:</strong> Martin Schanzenbach
+          {% endtrans %}
+        </p>
+      </section>
+
+
+
       <section>
         <h4>re:claimID/GNUnet Browser Plugin</h4>
         <p>
@@ -103,8 +181,38 @@
         </p>
       </section>
 
+      <section>
+        <h4>Rust templates for GNUnet services</h4>
+        <p>
+          {% trans %}
+          The goal is to either build upon the (outdated) <a href="https://github.com/canndrew/gnunet-rs">GNUnet Rust
+          bindings</a> or to follow the path of <a href="GNUnet Go">https://github.com/bfix/gnunet-go</a>
+          which tries to reimplement most of the GNUnet stack.
+          The end result should be an extension template for GNUnet in the form
+          of the existing <a href="https://git.gnunet.org/gnunet-ext.git/">C template</a>
+          which allows to quickly start implementing services and libraries
+          for GNUnet.
+          {% endtrans %}
+        </p>
+        <p>
+          {% trans %}
+            <strong>Mentors:</strong> Martin Schanzenbach
+          {% endtrans %}
+        </p>
+        <p>
+          {% trans %}
+            Required Skills: Solid knowledge of Rust and ideally asynchronuous IO.
+          {% endtrans %}
+        </p>
+        <p>
+          {% trans %}
+            Difficulty level: medium
+          {% endtrans %}
+        </p>
+      </section>
+
       <!-- Past projects: Previously proposed, but left unfinished. Inspiration for students. -->
-      <h2><a name="past" class="subnav-anchor"></a>{{ _("Past projects") }}</h2>
+      <!--<h2><a name="past" class="subnav-anchor"></a>{{ _("Past projects") }}</h2>
       <p>
         Past projects: Previously proposed, but left unfinished. Inspiration for students.
       </p>
@@ -183,42 +291,6 @@
         </p>
       </section>
       <section>
-        <h4>Rust APIs for GNUnet services</h4>
-        <p>
-          {% trans %}
-            There are a variety of GNUNet APIs that should be
-            exposed in the Rust wrappers.  Implementing these will
-            require extending the port of GNUNet utils written by
-            Andrew Cann and Kelong Cong.
-          {% endtrans %}
-        </p>
-        <p>
-          {% trans %}
-            As an introduction to the code base, we suggest that the
-            student and Jeff Burdges together update the
-            asynchronous IO system from gjio to futures-rs or
-            another layer built upon it.  Jeff Burdges is expected
-            to concurrently be implementing a GNUNet API for his own
-            mix network work.
-          {% endtrans %}
-        </p>
-        <p>
-          {% trans %}
-            <strong>Mentors:</strong> Jeff Burdges
-          {% endtrans %}
-        </p>
-        <p>
-          {% trans %}
-            Required Skills: Rust
-          {% endtrans %}
-        </p>
-        <p>
-          {% trans %}
-            Difficulty level: low
-          {% endtrans %}
-        </p>
-      </section>
-      <section>
         <h4>Tor compatibility for GNUnet</h4>
         <p>
           {% trans %}
@@ -520,6 +592,7 @@
           {% endtrans %}
         </p>
       </section>
+      -->
       <h2><a name="finished" class="subnav-anchor"></a>{{ _("Finished projects") }}</h2>
       <!-- Commentary: Finished projects, descriptions and Links to write-ups about them. -->
       <h3>2019</h3>