Allow /feed (Fixes #65)

Author: austinwbest

root/app/www/public/api/index.php

@@ -159,7 +159,7 @@
     $proxiedApp = $starr->getAppFromProxiedKey($apikey);
     $app        = $starr->getStarrInterfaceNameFromId($proxiedApp['starrAppDetails']['starr']);
 
-    if (!$proxiedApp) {
+    if (!$proxiedApp || !$proxiedApp['starrApp']) {
         logger($logfile, ['req' => $requestCounter, 'apikey' => $apikey, 'endpoint' => $endpoint, 'proxyCode' => 401]);
         apiResponse(401, ['error' => sprintf(APP_API_ERROR, 'provided apikey is not valid or has no access')]);
     }
@@ -177,6 +177,18 @@
             header('Content-disposition: attachment; filename="' . $proxyBackup . '"'); 
             readfile($proxyBackup);
         }
+    } elseif (!$endpoint && $_GET['feed']) { //-- iCal links, let them through
+        unset($variables['feed'], $variables['apikey']);
+        $starrUrl   = $proxiedApp['starrAppDetails']['url'] . $_GET['feed'] . ($variables ? '?' . http_build_query($variables) : '');
+        $request    = curl($starrUrl, ['X-Api-Key:' . $proxiedApp['starrAppDetails']['apikey']], $method, $json);
+
+        logger($logfile, ['req' => $requestCounter, 'apikey' => $apikey, 'endpoint' => $_GET['feed'] . ($variables ? '?' . http_build_query($variables) : ''), 'proxyCode' => 200, 'starrCode' => $request['code']]);
+        logger($proxiedAppLogfile, ['req' => $requestCounter, 'apikey' => $apikey, 'endpoint' => $_GET['feed'] . ($variables ? '?' . http_build_query($variables) : ''), 'proxyCode' => 200, 'starrCode' => $request['code'], 'starrRequest' => $request]);
+
+        $usageDb->adjustAppUsage($proxiedApp['proxiedAppDetails']['id'], $request['code']);
+
+        echo $request['response'];
+        exit();
     } else {
         $isAllowedEndpoint  = $starr->isAllowedEndpoint($app, $proxiedApp['access'], $endpoint);
         $starrEndpoint      = $isAllowedEndpoint['starrEndpoint'];

root/etc/nginx/nginx.conf

@@ -114,6 +114,10 @@ http {
             try_files $uri /api/index.php?endpoint=/api/$2&$args;
         }
 
+        location ~ ^(.*)/feed/(.*)$ {
+            try_files $uri /api/index.php?feed=/feed/$2&$args;
+        }
+
         location ~ ^(.*)/backup/(.*)$ {
             try_files $uri /api/index.php?backup=/backup/$2&$args;
         }