namespace Shaarli\Front;
use Shaarli\Container\ShaarliContainer;
-use Shaarli\Front\Exception\ShaarliFrontException;
use Shaarli\Front\Exception\UnauthorizedException;
use Slim\Http\Request;
use Slim\Http\Response;
*/
public function __invoke(Request $request, Response $response, callable $next): Response
{
- $this->container->basePath = rtrim($request->getUri()->getBasePath(), '/');
+ $this->initBasePath($request);
try {
- if (!is_file($this->container->conf->getConfigFileExt())
+ if (
+ !is_file($this->container->conf->getConfigFileExt())
&& !in_array($next->getName(), ['displayInstall', 'saveInstall'], true)
) {
return $response->withRedirect($this->container->basePath . '/install');
$this->checkOpenShaarli($request, $response, $next);
return $next($request, $response);
- } catch (ShaarliFrontException $e) {
- // Possible functional error
- $this->container->pageBuilder->reset();
- $this->container->pageBuilder->assign('message', $e->getMessage());
-
- $response = $response->withStatus($e->getCode());
-
- return $response->write($this->container->pageBuilder->render('error'));
} catch (UnauthorizedException $e) {
- return $response->withRedirect($this->container->basePath . '/login');
- } catch (\Throwable $e) {
- // Unknown error encountered
- $this->container->pageBuilder->reset();
- if ($this->container->conf->get('dev.debug', false)) {
- $this->container->pageBuilder->assign('message', $e->getMessage());
- $this->container->pageBuilder->assign(
- 'stacktrace',
- nl2br(get_class($e) .': '. PHP_EOL . $e->getTraceAsString())
- );
- } else {
- $this->container->pageBuilder->assign('message', t('An unexpected error occurred.'));
- }
+ $returnUrl = urlencode($this->container->environment['REQUEST_URI']);
- $response = $response->withStatus(500);
-
- return $response->write($this->container->pageBuilder->render('error'));
+ return $response->withRedirect($this->container->basePath . '/login?returnurl=' . $returnUrl);
}
+ // Other exceptions are handled by ErrorController
}
/**
return;
}
+ $this->container->updater->setBasePath($this->container->basePath);
$newUpdates = $this->container->updater->update();
if (!empty($newUpdates)) {
$this->container->updater->writeUpdates(
*/
protected function checkOpenShaarli(Request $request, Response $response, callable $next): bool
{
- if (// if the user isn't logged in
+ if (
+// if the user isn't logged in
!$this->container->loginManager->isLoggedIn()
// and Shaarli doesn't have public content...
&& $this->container->conf->get('privacy.hide_public_links')
&& $this->container->conf->get('privacy.force_login')
// and the current page isn't already the login page
// and the user is not requesting a feed (which would lead to a different content-type as expected)
- && !in_array($next->getName(), ['login', 'atom', 'rss'], true)
+ && !in_array($next->getName(), ['login', 'processLogin', 'atom', 'rss'], true)
) {
throw new UnauthorizedException();
}
return true;
}
+
+ /**
+ * Initialize the URL base path if it hasn't been defined yet.
+ */
+ protected function initBasePath(Request $request): void
+ {
+ if (null === $this->container->basePath) {
+ $this->container->basePath = rtrim($request->getUri()->getBasePath(), '/');
+ }
+ }
}