From: Marcin Haba <marcin.haba@bacula.pl>
Date: Sun, 4 Aug 2019 10:21:55 +0000 (+0200)
Subject: baculum: Misc changes to keep backward compatibility in API endpoints
X-Git-Tag: Release-9.6.0~157
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=5ab301ae0b7d8987dfc830faee0005a6b4e10c14;p=thirdparty%2Fbacula.git

baculum: Misc changes to keep backward compatibility in API endpoints
---

diff --git a/gui/baculum/examples/deb-template/baculum-api-apache.conf b/gui/baculum/examples/deb-template/baculum-api-apache.conf
index 17b96939f1..abb644c419 100644
--- a/gui/baculum/examples/deb-template/baculum-api-apache.conf
+++ b/gui/baculum/examples/deb-template/baculum-api-apache.conf
@@ -17,7 +17,8 @@ Listen 9096
 		RewriteEngine On
 
 		RewriteCond %{REQUEST_URI} ^/index\.php$ [OR]
-		RewriteCond %{REQUEST_URI} ^/$
+		RewriteCond %{REQUEST_URI} ^/$ [OR]
+		RewriteCond %{REQUEST_URI} ^/api/page
 		RewriteRule ^(.+)$ /panel? [L]
 
 		RewriteCond %{REQUEST_FILENAME} !-d
diff --git a/gui/baculum/examples/deb-template/baculum-api-lighttpd.conf b/gui/baculum/examples/deb-template/baculum-api-lighttpd.conf
index 9887a634d2..a74ddd8317 100644
--- a/gui/baculum/examples/deb-template/baculum-api-lighttpd.conf
+++ b/gui/baculum/examples/deb-template/baculum-api-lighttpd.conf
@@ -86,6 +86,7 @@ url.rewrite-once = (
 	"^/themes/(.+)$" => "/themes/$1",
 	"^/assets/(.+)$" => "/assets/$1",
 	"^/((index\.php)?\?.+)?$" => "/index.php/panel/",
+	"^/api/page" => "/index.php/panel/",
 	"^/(.+)$" => "/index.php/$1"
 )
 
diff --git a/gui/baculum/examples/deb/baculum-api-apache.conf b/gui/baculum/examples/deb/baculum-api-apache.conf
index 8b14fd3458..5c4e67699e 100644
--- a/gui/baculum/examples/deb/baculum-api-apache.conf
+++ b/gui/baculum/examples/deb/baculum-api-apache.conf
@@ -17,7 +17,8 @@ Listen 9096
 		RewriteEngine On
 
 		RewriteCond %{REQUEST_URI} ^/index\.php$ [OR]
-		RewriteCond %{REQUEST_URI} ^/$
+		RewriteCond %{REQUEST_URI} ^/$ [OR]
+		RewriteCond %{REQUEST_URI} ^/api/page
 		RewriteRule ^(.+)$ /panel? [L]
 
 		RewriteCond %{REQUEST_FILENAME} !-d
diff --git a/gui/baculum/examples/deb/baculum-api-lighttpd.conf b/gui/baculum/examples/deb/baculum-api-lighttpd.conf
index 422b42dd6f..cb6ae7b99a 100644
--- a/gui/baculum/examples/deb/baculum-api-lighttpd.conf
+++ b/gui/baculum/examples/deb/baculum-api-lighttpd.conf
@@ -86,6 +86,7 @@ url.rewrite-once = (
 	"^/themes/(.+)$" => "/themes/$1",
 	"^/assets/(.+)$" => "/assets/$1",
 	"^/((index\.php)?\?.+)?$" => "/index.php/panel/",
+	"^/api/page" => "/index.php/panel/",
 	"^/(.+)$" => "/index.php/$1"
 )
 
diff --git a/gui/baculum/examples/rpm-template/baculum-api-apache.conf b/gui/baculum/examples/rpm-template/baculum-api-apache.conf
index 17b96939f1..abb644c419 100644
--- a/gui/baculum/examples/rpm-template/baculum-api-apache.conf
+++ b/gui/baculum/examples/rpm-template/baculum-api-apache.conf
@@ -17,7 +17,8 @@ Listen 9096
 		RewriteEngine On
 
 		RewriteCond %{REQUEST_URI} ^/index\.php$ [OR]
-		RewriteCond %{REQUEST_URI} ^/$
+		RewriteCond %{REQUEST_URI} ^/$ [OR]
+		RewriteCond %{REQUEST_URI} ^/api/page
 		RewriteRule ^(.+)$ /panel? [L]
 
 		RewriteCond %{REQUEST_FILENAME} !-d
diff --git a/gui/baculum/examples/rpm-template/baculum-api-lighttpd.conf b/gui/baculum/examples/rpm-template/baculum-api-lighttpd.conf
index bbc7c481b8..d9df476e4b 100644
--- a/gui/baculum/examples/rpm-template/baculum-api-lighttpd.conf
+++ b/gui/baculum/examples/rpm-template/baculum-api-lighttpd.conf
@@ -86,6 +86,7 @@ url.rewrite-once = (
 	"^/themes/(.+)$" => "/themes/$1",
 	"^/assets/(.+)$" => "/assets/$1",
 	"^/((index\.php)?\?.+)?$" => "/index.php/panel/",
+	"^/api/page" => "/index.php/panel/",
 	"^/(.+)$" => "/index.php/$1"
 )
 
diff --git a/gui/baculum/examples/rpm/baculum-api-apache.conf b/gui/baculum/examples/rpm/baculum-api-apache.conf
index 65e3fb81b4..a711022e0d 100644
--- a/gui/baculum/examples/rpm/baculum-api-apache.conf
+++ b/gui/baculum/examples/rpm/baculum-api-apache.conf
@@ -17,7 +17,8 @@ Listen 9096
 		RewriteEngine On
 
 		RewriteCond %{REQUEST_URI} ^/index\.php$ [OR]
-		RewriteCond %{REQUEST_URI} ^/$
+		RewriteCond %{REQUEST_URI} ^/$ [OR]
+		RewriteCond %{REQUEST_URI} ^/api/page
 		RewriteRule ^(.+)$ /panel? [L]
 
 		RewriteCond %{REQUEST_FILENAME} !-d
diff --git a/gui/baculum/examples/rpm/baculum-api-lighttpd.conf b/gui/baculum/examples/rpm/baculum-api-lighttpd.conf
index 4c0a56f853..14c6cf2717 100644
--- a/gui/baculum/examples/rpm/baculum-api-lighttpd.conf
+++ b/gui/baculum/examples/rpm/baculum-api-lighttpd.conf
@@ -86,6 +86,7 @@ url.rewrite-once = (
 	"^/themes/(.+)$" => "/themes/$1",
 	"^/assets/(.+)$" => "/assets/$1",
 	"^/((index\.php)?\?.+)?$" => "/index.php/panel/",
+	"^/api/page" => "/index.php/panel/",
 	"^/(.+)$" => "/index.php/$1"
 )
 
diff --git a/gui/baculum/protected/API/Pages/API/Authorize.php b/gui/baculum/protected/API/Pages/API/Authorize.php
new file mode 100644
index 0000000000..cecdcf1d76
--- /dev/null
+++ b/gui/baculum/protected/API/Pages/API/Authorize.php
@@ -0,0 +1,24 @@
+<?php
+/*
+ * Bacula(R) - The Network Backup Solution
+ * Baculum   - Bacula web interface
+ *
+ * Copyright (C) 2013-2019 Kern Sibbald
+ *
+ * The main author of Baculum is Marcin Haba.
+ * The original author of Bacula is Kern Sibbald, with contributions
+ * from many others, a complete list can be found in the file AUTHORS.
+ *
+ * You may use this file and others of this release according to the
+ * license defined in the LICENSE file, which includes the Affero General
+ * Public License, v3.0 ("AGPLv3") and some additional permissions and
+ * terms pursuant to its AGPLv3 Section 7.
+ *
+ * This notice must be preserved when any source code is
+ * conveyed and/or propagated.
+ *
+ * Bacula(R) is a registered trademark of Kern Sibbald.
+ */
+
+Prado::using('Application.API.Pages.OAuth2.Authorize');
+?>
diff --git a/gui/baculum/protected/API/Pages/API/RequestToken.php b/gui/baculum/protected/API/Pages/API/RequestToken.php
new file mode 100644
index 0000000000..b4a56fc12a
--- /dev/null
+++ b/gui/baculum/protected/API/Pages/API/RequestToken.php
@@ -0,0 +1,24 @@
+<?php
+/*
+ * Bacula(R) - The Network Backup Solution
+ * Baculum   - Bacula web interface
+ *
+ * Copyright (C) 2013-2019 Kern Sibbald
+ *
+ * The main author of Baculum is Marcin Haba.
+ * The original author of Bacula is Kern Sibbald, with contributions
+ * from many others, a complete list can be found in the file AUTHORS.
+ *
+ * You may use this file and others of this release according to the
+ * license defined in the LICENSE file, which includes the Affero General
+ * Public License, v3.0 ("AGPLv3") and some additional permissions and
+ * terms pursuant to its AGPLv3 Section 7.
+ *
+ * This notice must be preserved when any source code is
+ * conveyed and/or propagated.
+ *
+ * Bacula(R) is a registered trademark of Kern Sibbald.
+ */
+
+Prado::using('Application.API.Pages.OAuth2.RequestToken');
+?>
diff --git a/gui/baculum/protected/API/Pages/API/config.xml b/gui/baculum/protected/API/Pages/API/config.xml
index 25baaf7e80..e379d70d9a 100644
--- a/gui/baculum/protected/API/Pages/API/config.xml
+++ b/gui/baculum/protected/API/Pages/API/config.xml
@@ -3,8 +3,13 @@
 		<using namespace="Application.API.Class.BaculumAPIServer" />
 	</paths>
 	<modules>
-		<!-- auth modules -->
+		<!-- OAuth2 - only to be compatible with old OAuth2 endpoints -->
+		<!-- Remove it in the future but keep oauth2_token (it is used in this service to remove old tokens) -->
+		<module id="oauth2" class="Application.API.Class.OAuth2.BaculumOAuth2" />
+		<module id="oauth2_config" class="Application.API.Class.OAuth2.OAuth2Config" />
+		<module id="oauth2_authid" class="Application.API.Class.OAuth2.AuthIdManager" />
 		<module id="oauth2_token" class="Application.API.Class.OAuth2.TokenManager" />
+
 		<!-- database modules -->
 		<module id="db" class="Application.API.Class.Database" />
 		<module id="client" class="Application.API.Class.ClientManager" />
diff --git a/gui/baculum/protected/API/Pages/API/endpoints.xml b/gui/baculum/protected/API/Pages/API/endpoints.xml
index a58c4b4eb4..dd8109ba94 100644
--- a/gui/baculum/protected/API/Pages/API/endpoints.xml
+++ b/gui/baculum/protected/API/Pages/API/endpoints.xml
@@ -1,5 +1,11 @@
 <urls>
 	<!-- #### NEW API version 1 #### -->
+
+	<!-- OAuth2 - only to be compatible with old OAuth2 endpoints -->
+	<!-- Remove it in the future -->
+	<url ServiceParameter="Authorize" pattern="api/auth/" />
+	<url ServiceParameter="RequestToken" pattern="api/token/" />
+
 	<!-- general endpoint -->
 	<url ServiceParameter="Welcome" pattern="api/v1/welcome/" />
 	<!-- bconsole endpoints -->