From 33efe571e3e7ebd607e92345c2e94e7fd8ae27f0 Mon Sep 17 00:00:00 2001
From: Florian Pritz <bluewind@xinu.at>
Date: Mon, 2 Feb 2015 19:45:11 +0100
Subject: Rework api error handling

Signed-off-by: Florian Pritz <bluewind@xinu.at>
---
 application/exceptions/ApiException.php       | 30 +++++++++++++++++++++++++++
 application/exceptions/PublicApiException.php | 10 +++++++++
 2 files changed, 40 insertions(+)
 create mode 100644 application/exceptions/ApiException.php
 create mode 100644 application/exceptions/PublicApiException.php

(limited to 'application/exceptions')

diff --git a/application/exceptions/ApiException.php b/application/exceptions/ApiException.php
new file mode 100644
index 000000000..b288bbaa2
--- /dev/null
+++ b/application/exceptions/ApiException.php
@@ -0,0 +1,30 @@
+<?php
+/*
+ * Licensed under AGPLv3
+ * (see COPYING for full license text)
+ *
+ */
+namespace exceptions;
+
+class ApiException extends \Exception {
+	private $error_id;
+	private $data;
+
+	public function __construct($error_id, $message, $data = null)
+	{
+		parent::__construct($message);
+
+		$this->error_id = $error_id;
+		$this->data = $data;
+	}
+
+	public function get_error_id()
+	{
+		return $this->error_id;
+	}
+
+	public function get_data()
+	{
+		return $this->data;
+	}
+}
diff --git a/application/exceptions/PublicApiException.php b/application/exceptions/PublicApiException.php
new file mode 100644
index 000000000..e7aa4360a
--- /dev/null
+++ b/application/exceptions/PublicApiException.php
@@ -0,0 +1,10 @@
+<?php
+/*
+ * Licensed under AGPLv3
+ * (see COPYING for full license text)
+ *
+ */
+namespace exceptions;
+
+class PublicApiException extends ApiException {
+}
-- 
cgit v1.2.3-24-g4f1b


From cb52a4cdc2daa45a61c728f5ec83603e6c6a71fa Mon Sep 17 00:00:00 2001
From: Florian Pritz <bluewind@xinu.at>
Date: Tue, 3 Feb 2015 00:23:12 +0100
Subject: Rework error handling in upload validator

Signed-off-by: Florian Pritz <bluewind@xinu.at>
---
 .../exceptions/FileUploadVerifyException.php       | 23 ++++++++++++++++++++++
 application/exceptions/PublicApiException.php      |  4 ++++
 application/exceptions/UserInputException.php      | 10 ++++++++++
 3 files changed, 37 insertions(+)
 create mode 100644 application/exceptions/FileUploadVerifyException.php
 create mode 100644 application/exceptions/UserInputException.php

(limited to 'application/exceptions')

diff --git a/application/exceptions/FileUploadVerifyException.php b/application/exceptions/FileUploadVerifyException.php
new file mode 100644
index 000000000..d091c1eab
--- /dev/null
+++ b/application/exceptions/FileUploadVerifyException.php
@@ -0,0 +1,23 @@
+<?php
+/*
+ * Licensed under AGPLv3
+ * (see COPYING for full license text)
+ *
+ */
+namespace exceptions;
+
+class FileUploadVerifyException extends UserInputException {
+	public function __toString()
+	{
+		$ret = $this->getMessage()."\n";
+		$data = $this->get_data();
+		$errors = array();
+
+		foreach ($data as $error) {
+			$errors[] = sprintf("%s: %s", $error["filename"], $error["message"]);
+		}
+
+		$ret .= implode("\n", $errors);
+		return $ret;
+	}
+}
diff --git a/application/exceptions/PublicApiException.php b/application/exceptions/PublicApiException.php
index e7aa4360a..d22309478 100644
--- a/application/exceptions/PublicApiException.php
+++ b/application/exceptions/PublicApiException.php
@@ -7,4 +7,8 @@
 namespace exceptions;
 
 class PublicApiException extends ApiException {
+	public function __toString()
+	{
+		return $this->getMessage();
+	}
 }
diff --git a/application/exceptions/UserInputException.php b/application/exceptions/UserInputException.php
new file mode 100644
index 000000000..150d0204b
--- /dev/null
+++ b/application/exceptions/UserInputException.php
@@ -0,0 +1,10 @@
+<?php
+/*
+ * Licensed under AGPLv3
+ * (see COPYING for full license text)
+ *
+ */
+namespace exceptions;
+
+class UserInputException extends PublicApiException {
+}
-- 
cgit v1.2.3-24-g4f1b


From 5816cbcad0e9c4cda4dc10b730a5a1ea2c4e419a Mon Sep 17 00:00:00 2001
From: Florian Pritz <bluewind@xinu.at>
Date: Tue, 3 Feb 2015 12:11:28 +0100
Subject: api: implement file/create_multipaste

Signed-off-by: Florian Pritz <bluewind@xinu.at>
---
 .../exceptions/FileUploadVerifyException.php       |  2 +-
 application/exceptions/VerifyException.php         | 23 ++++++++++++++++++++++
 2 files changed, 24 insertions(+), 1 deletion(-)
 create mode 100644 application/exceptions/VerifyException.php

(limited to 'application/exceptions')

diff --git a/application/exceptions/FileUploadVerifyException.php b/application/exceptions/FileUploadVerifyException.php
index d091c1eab..5125e4822 100644
--- a/application/exceptions/FileUploadVerifyException.php
+++ b/application/exceptions/FileUploadVerifyException.php
@@ -6,7 +6,7 @@
  */
 namespace exceptions;
 
-class FileUploadVerifyException extends UserInputException {
+class FileUploadVerifyException extends VerifyException {
 	public function __toString()
 	{
 		$ret = $this->getMessage()."\n";
diff --git a/application/exceptions/VerifyException.php b/application/exceptions/VerifyException.php
new file mode 100644
index 000000000..0e9d8b93a
--- /dev/null
+++ b/application/exceptions/VerifyException.php
@@ -0,0 +1,23 @@
+<?php
+/*
+ * Licensed under AGPLv3
+ * (see COPYING for full license text)
+ *
+ */
+namespace exceptions;
+
+class VerifyException extends UserInputException {
+	public function __toString()
+	{
+		$ret = $this->getMessage()."\n";
+		$data = $this->get_data();
+		$errors = array();
+
+		foreach ($data as $error) {
+			$errors[] = sprintf("%s: %s", $error["id"], $error["reason"]);
+		}
+
+		$ret .= implode("\n", $errors);
+		return $ret;
+	}
+}
-- 
cgit v1.2.3-24-g4f1b


From bcd7920b817b60df9b1b266118419e44c39900db Mon Sep 17 00:00:00 2001
From: Florian Pritz <bluewind@xinu.at>
Date: Tue, 3 Feb 2015 13:59:59 +0100
Subject: generalize authentication handling

Signed-off-by: Florian Pritz <bluewind@xinu.at>
---
 application/exceptions/ApiException.php                    |  5 +++++
 .../exceptions/InsufficientPermissionsException.php        | 14 ++++++++++++++
 application/exceptions/NotAuthenticatedException.php       | 14 ++++++++++++++
 application/exceptions/UserInputException.php              |  4 ++++
 4 files changed, 37 insertions(+)
 create mode 100644 application/exceptions/InsufficientPermissionsException.php
 create mode 100644 application/exceptions/NotAuthenticatedException.php

(limited to 'application/exceptions')

diff --git a/application/exceptions/ApiException.php b/application/exceptions/ApiException.php
index b288bbaa2..b3b9decff 100644
--- a/application/exceptions/ApiException.php
+++ b/application/exceptions/ApiException.php
@@ -27,4 +27,9 @@ class ApiException extends \Exception {
 	{
 		return $this->data;
 	}
+
+	public function get_http_error_code()
+	{
+		return 500;
+	}
 }
diff --git a/application/exceptions/InsufficientPermissionsException.php b/application/exceptions/InsufficientPermissionsException.php
new file mode 100644
index 000000000..a036edf9d
--- /dev/null
+++ b/application/exceptions/InsufficientPermissionsException.php
@@ -0,0 +1,14 @@
+<?php
+/*
+ * Licensed under AGPLv3
+ * (see COPYING for full license text)
+ *
+ */
+namespace exceptions;
+
+class InsufficientPermissionsException extends UserInputException {
+	public function get_http_error_code()
+	{
+		return 403;
+	}
+}
diff --git a/application/exceptions/NotAuthenticatedException.php b/application/exceptions/NotAuthenticatedException.php
new file mode 100644
index 000000000..de26318d8
--- /dev/null
+++ b/application/exceptions/NotAuthenticatedException.php
@@ -0,0 +1,14 @@
+<?php
+/*
+ * Licensed under AGPLv3
+ * (see COPYING for full license text)
+ *
+ */
+namespace exceptions;
+
+class NotAuthenticatedException extends UserInputException {
+	public function get_http_error_code()
+	{
+		return 401;
+	}
+}
diff --git a/application/exceptions/UserInputException.php b/application/exceptions/UserInputException.php
index 150d0204b..d4c327315 100644
--- a/application/exceptions/UserInputException.php
+++ b/application/exceptions/UserInputException.php
@@ -7,4 +7,8 @@
 namespace exceptions;
 
 class UserInputException extends PublicApiException {
+	public function get_http_error_code()
+	{
+		return 400;
+	}
 }
-- 
cgit v1.2.3-24-g4f1b


From a842392c30e9ef1d1d2bd9b4eb271c3fd23b853f Mon Sep 17 00:00:00 2001
From: Florian Pritz <bluewind@xinu.at>
Date: Tue, 3 Feb 2015 17:17:27 +0100
Subject: Use exceptions instead of show_error

Signed-off-by: Florian Pritz <bluewind@xinu.at>
---
 application/exceptions/NotFoundException.php      | 14 ++++++++++++++
 application/exceptions/RequestTooBigException.php | 14 ++++++++++++++
 2 files changed, 28 insertions(+)
 create mode 100644 application/exceptions/NotFoundException.php
 create mode 100644 application/exceptions/RequestTooBigException.php

(limited to 'application/exceptions')

diff --git a/application/exceptions/NotFoundException.php b/application/exceptions/NotFoundException.php
new file mode 100644
index 000000000..c4b9d1537
--- /dev/null
+++ b/application/exceptions/NotFoundException.php
@@ -0,0 +1,14 @@
+<?php
+/*
+ * Licensed under AGPLv3
+ * (see COPYING for full license text)
+ *
+ */
+namespace exceptions;
+
+class NotFoundException extends UserInputException {
+	public function get_http_error_code()
+	{
+		return 404;
+	}
+}
diff --git a/application/exceptions/RequestTooBigException.php b/application/exceptions/RequestTooBigException.php
new file mode 100644
index 000000000..ae2ab4d22
--- /dev/null
+++ b/application/exceptions/RequestTooBigException.php
@@ -0,0 +1,14 @@
+<?php
+/*
+ * Licensed under AGPLv3
+ * (see COPYING for full license text)
+ *
+ */
+namespace exceptions;
+
+class RequestTooBigException extends UserInputException {
+	public function get_http_error_code()
+	{
+		return 413;
+	}
+}
-- 
cgit v1.2.3-24-g4f1b