From 171cd3504615382db0783495b6abd18608627d50 Mon Sep 17 00:00:00 2001
From: cos <cos>
Date: Sun, 7 Dec 2014 16:58:20 +0100
Subject: Implement relocate command.

---
 cgi-bin/mat.cgi | 73 ++++++++++++++++++++++++++++++++++++++++++++++++---------
 1 file changed, 62 insertions(+), 11 deletions(-)

diff --git a/cgi-bin/mat.cgi b/cgi-bin/mat.cgi
index 7b31e87..4275478 100755
--- a/cgi-bin/mat.cgi
+++ b/cgi-bin/mat.cgi
@@ -5,6 +5,7 @@ use warnings;
 
 use Config::Simple;
 use CGI::Simple;
+use CGI::Session;
 use DBI;
 
 tie my %Config, "Config::Simple", '/etc/mat.conf';
@@ -12,6 +13,9 @@ tie my %Config, "Config::Simple", '/etc/mat.conf';
 my $q = new CGI::Simple;
 my $id = $q->param('id');
 my $action = $q->param('action');
+my $storage = $q->param('storage');
+my $session = CGI::Session->new(undef, undef, {Directory =>
+    $Config{'session_directory'}});
 
 sub misconfigured
 {
@@ -27,20 +31,67 @@ sub invalid_input()
   exit 1;
 }
 
+sub unauthorized()
+{
+  print "Content-Type: text/plain; charset=utf-8\n\r\n\r";
+  print "Not authorized!\n";
+  exit 1;
+}
+
+sub send_cookie()
+{
+  print $session->header(-type => 'text/plain', -charset => 'utf8');
+}
+
+sub cmd_view($)
+{
+  my ( $id ) = @_;
+
+  my $db = DBI->connect($Config{'database'}, "", "",
+      {HandleError => \&misconfigured, AutoCommit => 1});
+
+  my $recipe_row = $db->selectrow_arrayref("SELECT name, storage, uri FROM ".
+      "recipes AS r JOIN inventory AS i ON i.recipe_id=r.id WHERE i.id=".$id.
+      ";");
+
+  print $id, "\n", $$recipe_row[0], "\n", $$recipe_row[1], "\n",
+      $$recipe_row[2], "\n";
+}
+
+sub cmd_relocate($$)
+{
+  my ( $id, $storage ) = @_;
+
+  my $db = DBI->connect($Config{'database'}, "", "",
+      {HandleError => \&misconfigured, AutoCommit => 1});
+
+  $db->do('UPDATE inventory SET storage="'.$storage.'" WHERE id='.$id);
+
+  cmd_view($id);
+}
+
 ### MAIN PROGRAM ##############################################################
 
 misconfigured unless ($Config{'database'});
+misconfigured unless $session;
 invalid_input unless ($id and $action);
 
-invalid_input unless (($id =~ m/^[0-9]+$/) and ($action =~ m/^view$/));
-
-my $db = DBI->connect($Config{'database'}, "", "",
-    {HandleError => \&misconfigured, AutoCommit => 1});
+invalid_input unless (($id =~ m/^[0-9]+$/) and ($action =~ m/^view|relocate$/) and
+    ($storage =~ /^[a-z0-9]*$/));
+send_cookie;
 
-my $recipe_row = $db->selectrow_arrayref("SELECT name, storage, uri FROM ".
-    "recipes AS r JOIN inventory AS i ON i.recipe_id=r.id WHERE i.id=".$id.
-    ";");
-
-print "Content-Type: text/plain; charset=utf-8\n\r\n\r";
-print $id, "\n", $$recipe_row[0], "\n", $$recipe_row[1], "\n", 
-    $$recipe_row[2], "\n";
+for ($action) {
+  if    (/^view$/) {
+    cmd_view($id);
+  }
+  elsif (/^relocate$/) {
+    if ($session->param('authenticated') eq "yes") {
+      cmd_relocate($id, $storage);
+    } else {
+      unauthorized();
+    }
+  }
+  else {
+    invalid_input;
+  }
+}
-- 
cgit v1.2.3


From 8df944e4320ae7c8d63569ba11379a72afe338f7 Mon Sep 17 00:00:00 2001
From: cos <cos>
Date: Sat, 10 Jan 2015 20:28:55 +0100
Subject: Default session expiration was a bit quick.

---
 cgi-bin/mat.cgi | 1 +
 1 file changed, 1 insertion(+)

diff --git a/cgi-bin/mat.cgi b/cgi-bin/mat.cgi
index 4275478..d6e3d2d 100755
--- a/cgi-bin/mat.cgi
+++ b/cgi-bin/mat.cgi
@@ -86,6 +86,7 @@ for ($action) {
   }
   elsif (/^relocate$/) {
     if ($session->param('authenticated') eq "yes") {
+      $session->expire("5y");
       cmd_relocate($id, $storage);
     } else {
       unauthorized();
-- 
cgit v1.2.3


From 31ee33ca4c14c03f5e1a2530735bda50d235de36 Mon Sep 17 00:00:00 2001
From: cos <cos>
Date: Sat, 10 Jan 2015 21:40:16 +0100
Subject: Add storage links on relocate page.

---
 cgi-bin/mat.cgi | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/cgi-bin/mat.cgi b/cgi-bin/mat.cgi
index d6e3d2d..793671a 100755
--- a/cgi-bin/mat.cgi
+++ b/cgi-bin/mat.cgi
@@ -40,7 +40,7 @@ sub unauthorized()
 
 sub send_cookie()
 {
-  print $session->header(-type => 'text/plain', -charset => 'utf8');
+  print $session->header(-type => 'text/html', -charset => 'utf8');
 }
 
 sub cmd_view($)
@@ -54,8 +54,20 @@ sub cmd_view($)
       "recipes AS r JOIN inventory AS i ON i.recipe_id=r.id WHERE i.id=".$id.
       ";");
 
-  print $id, "\n", $$recipe_row[0], "\n", $$recipe_row[1], "\n",
-      $$recipe_row[2], "\n";
+  print $id, "<br />", $$recipe_row[0], "<br />", $$recipe_row[1], "<br />";
+  if(substr($$recipe_row[2], 0, 4) eq "http") {
+    print '<a href="'.$$recipe_row[2].'">'.$$recipe_row[2].'</a>', "<br />";
+  } else {
+    print $$recipe_row[2], "<br />";
+  }
+  if ($session->param('authenticated') eq "yes") {
+    print "<font size=20>\n";
+    for my $store ( split(" ", $Config{'relocate_stores'}) ) {
+      print " <a href=".$Config{'label_id_prefix'}."$id/relocate/$store>".
+          "$store</a> \n";
+    }
+    print "</font>";
+  }
 }
 
 sub cmd_relocate($$)
-- 
cgit v1.2.3


From 7ac05dbbea8543e4b1e1ac3f46779b7ad5191a81 Mon Sep 17 00:00:00 2001
From: cos <cos>
Date: Sat, 10 Jan 2015 21:42:33 +0100
Subject: Initial commit of authenticate_session script.

---
 Makefile | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/Makefile b/Makefile
index a759288..8acae4d 100644
--- a/Makefile
+++ b/Makefile
@@ -19,3 +19,5 @@ all:
 install: $(INSTALLDIRS)
 	install -d $(DESTDIR)/usr/bin/
 	install mat $(DESTDIR)/usr/bin/
+	install -d $(DESTDIR)/usr/lib/netizen-mat/
+	install authenticate_session $(DESTDIR)/usr/lib/netizen-mat/
-- 
cgit v1.2.3