refactored strongswan manager

  removed buggy request parsing code, use ClearSilvers CGI kit instead
fixed CHILD_SA listing in manager (needs better design)
using secure XML communication through unix sockets
removed images with questionable (non-GPL) license

14 files changed, 43 insertions, 43 deletions

diff --git a/src/manager/templates/error.cs b/src/manager/templates/error.cs
new file mode 100644
index 000000000..be9b1a3a1
--- /dev/null
+++ b/src/manager/templates/error.cs
@@ -0,0 +1,3 @@
+<?cs include:"templates/header.cs" ?>
+<div><?cs var:error ?></div>
+<?cs include:"templates/footer.cs" ?>
diff --git a/src/manager/templates/static/client-left.png b/src/manager/templates/static/client-left.png
index ee4247d9d..8a082ff9e 100644
--- a/src/manager/templates/static/client-left.png
+++ b/src/manager/templates/static/client-left.png
diff --git a/src/manager/templates/static/client-right.png b/src/manager/templates/static/client-right.png
index 792aef69a..c841eebaf 100644
--- a/src/manager/templates/static/client-right.png
+++ b/src/manager/templates/static/client-right.png
diff --git a/src/manager/templates/static/gateway-left.png b/src/manager/templates/static/gateway-left.png
index b58436406..9ddd3624d 100644
--- a/src/manager/templates/static/gateway-left.png
+++ b/src/manager/templates/static/gateway-left.png
diff --git a/src/manager/templates/static/gateway-right.png b/src/manager/templates/static/gateway-right.png
index 4b370cbee..0be446827 100644
--- a/src/manager/templates/static/gateway-right.png
+++ b/src/manager/templates/static/gateway-right.png
diff --git a/src/manager/templates/static/nat.png b/src/manager/templates/static/nat.png
deleted file mode 100644
index f669b27c2..000000000
--- a/src/manager/templates/static/nat.png
+++ /dev/null
diff --git a/src/manager/templates/static/pipe-bad.png b/src/manager/templates/static/pipe-bad.png
index dede311de..dce7e836e 100644
--- a/src/manager/templates/static/pipe-bad.png
+++ b/src/manager/templates/static/pipe-bad.png
diff --git a/src/manager/templates/static/pipe-good.png b/src/manager/templates/static/pipe-good.png
index 9419fd3f4..1e254711c 100644
--- a/src/manager/templates/static/pipe-good.png
+++ b/src/manager/templates/static/pipe-good.png
diff --git a/src/manager/templates/static/pipe-thin-left.png b/src/manager/templates/static/pipe-thin-left.png
new file mode 100644
index 000000000..6ccc59a17
--- /dev/null
+++ b/src/manager/templates/static/pipe-thin-left.png
diff --git a/src/manager/templates/static/pipe-thin-right.png b/src/manager/templates/static/pipe-thin-right.png
new file mode 100644
index 000000000..1f582d24b
--- /dev/null
+++ b/src/manager/templates/static/pipe-thin-right.png
diff --git a/src/manager/templates/static/pipe-thin.png b/src/manager/templates/static/pipe-thin.png
new file mode 100644
index 000000000..d25f1b625
--- /dev/null
+++ b/src/manager/templates/static/pipe-thin.png
diff --git a/src/manager/templates/static/pipe.png b/src/manager/templates/static/pipe.png
index 931e1709e..1e254711c 100644
--- a/src/manager/templates/static/pipe.png
+++ b/src/manager/templates/static/pipe.png
diff --git a/src/manager/templates/static/router.png b/src/manager/templates/static/router.png
index 53114d9e6..12a68fc90 100644
--- a/src/manager/templates/static/router.png
+++ b/src/manager/templates/static/router.png
diff --git a/src/manager/templates/status/ikesalist.cs b/src/manager/templates/status/ikesalist.cs
index d329d070a..05c3268b6 100644
--- a/src/manager/templates/status/ikesalist.cs
+++ b/src/manager/templates/status/ikesalist.cs
@@ -2,7 +2,7 @@
 <?cs each:ikesa = ikesas ?>
   <div class="expand" id="ikesa-<?cs name:ikesa ?>">
   <h1>
-  	<?cs name:ikesa ?> [<?cs var:ikesa.peerconfig ?>]:
+  	IKE #<?cs name:ikesa ?> [<?cs var:ikesa.peerconfig ?>]:
   	<span><?cs var:ikesa.local.identification ?></span> &lt;-&gt; 
   	<span><?cs var:ikesa.remote.identification ?></span>
   </h1> 
@@ -10,48 +10,30 @@
     <hr/>
     <table class="drawing">
       <tr>
-        <td>
-        </td>
-        <td class="left" colspan="2">
+        <td class="left" colspan="3">
           <?cs var:ikesa.local.identification ?>
         </td>
         <td>
         </td>
-        <td class="right" colspan="2">
+        <td class="right" colspan="3">
           <?cs var:ikesa.remote.identification ?>
         </td>
-        <td>
-        </td>
-      </tr>
-      <tr>
-        <td>
-        </td>
-        <td>
-        </td>
-        <td class="center" colspan="3">
-          <?cs var:ikesa.local.spi ?> : <?cs var:ikesa.remote.spi ?>
-        </td>
-        <td>
-        </td>
-        <td>
-        </td>
       </tr>
       <tr class="images">
         <td>
-		<?cs each:net = ikesa.childsas.local ?>
-		  <p><?cs var:net ?></p>
-		<?cs /each ?>
-        </td>
-        <td>
           <?cs if:ikesa.role == "initiator" ?>
           <img title="Local host is the initiator" src="<?cs var:base ?>/static/client-left.png"></img>
           <?cs else ?>
           <img title="Local host is the responder" src="<?cs var:base ?>/static/gateway-left.png"></img>
           <?cs /if ?>
         </td>
+        <td style="background-image:url(<?cs var:base ?>/static/pipe.png)">
+	      <?cs var:ikesa.local.spi ?><br/><br/><br/> 
+	      <?cs var:ikesa.local.address ?>
+        </td>
         <td>
           <?cs if:ikesa.local.nat == "true" ?>
-          <img title="Local host is behind a NAT router" src="<?cs var:base ?>/static/router.png"></img>
+          <img title="Local host is behind NAT" src="<?cs var:base ?>/static/router.png"></img>
           <?cs else ?>
           <img title="Local host is not NATed" src="<?cs var:base ?>/static/pipe.png"></img>
           <?cs /if ?>
@@ -65,11 +47,15 @@
         </td>
         <td>
           <?cs if:ikesa.remote.nat == "true" ?>
-          <img title="Remote host is behind a NAT router" src="<?cs var:base ?>/static/router.png"></img>
+          <img title="Remote host is behind NAT" src="<?cs var:base ?>/static/router.png"></img>
           <?cs else ?>
           <img title="Remote host is not NATed" src="<?cs var:base ?>/static/pipe.png"></img>
           <?cs /if ?>
         </td>
+        <td class="right" style="background-image:url(<?cs var:base ?>/static/pipe.png)">
+	      <?cs var:ikesa.remote.spi ?><br/><br/><br/> 
+	      <?cs var:ikesa.remote.address ?>
+        </td>
         <td>
           <?cs if:ikesa.role == "responder" ?>
           <img title="Remote host is the initiator" src="<?cs var:base ?>/static/client-right.png"></img>
@@ -77,26 +63,37 @@
           <img title="Remote host is the responder" src="<?cs var:base ?>/static/gateway-right.png"></img>
           <?cs /if ?>
         </td>
-        <td>
-		<?cs each:net = ikesa.childsas.remote ?>
-		  <p><?cs var:net ?></p>
-		<?cs /each ?>
-        </td>
       </tr>
+      <?cs each:childsa = ikesa.childsas ?>
       <tr>
-        <td>
-        </td>
-        <td class="left" colspan="2">
-          <?cs var:ikesa.local.address ?>:<?cs var:ikesa.local.port ?>
-        </td>
-        <td>
-        </td>
-        <td class="right" colspan="2">
-          <?cs var:ikesa.remote.address ?>:<?cs var:ikesa.remote.port ?>
-        </td>
-        <td>
+      	<td colspan="7" class="expand">
+      	  <h1>IPsec #<?cs name:childsa ?> [<?cs var:childsa.childconfig ?>]:</h1>
         </td>
       </tr>
+      <tr>
+        <td colspan="7"><hr/></td>
+      </tr>
+      <tr class="images">
+      	<td colspan="2">
+          <?cs each:net = childsa.local.networks ?>
+      	    <p><?cs var:net ?></p>
+          <?cs /each ?>
+      	</td>
+      	<td style="background-image:url(<?cs var:base ?>/static/pipe-thin-left.png)">
+          <?cs var:childsa.local.spi ?><br/><br/><br/>
+      	</td>
+      	<td style="background-image:url(<?cs var:base ?>/static/pipe-thin.png)">
+      	</td>
+      	<td class="right" style="background-image:url(<?cs var:base ?>/static/pipe-thin-right.png)">
+          <?cs var:childsa.remote.spi ?><br/><br/><br/>
+      	</td>
+      	<td class="right" colspan="2">
+          <?cs each:net = childsa.remote.networks ?>
+      	    <p><?cs var:net ?></p>
+          <?cs /each ?>
+      	</td>
+      </tr>
+      <?cs /each ?>
     </table>
   </div>
   </div>