';
- print_r($licensedata);
- die();
+ die('Static License licenceStatus is true');
}
else
{
diff --git a/system/typemill/Static/Urlinfo.php b/system/typemill/Static/Urlinfo.php
new file mode 100644
index 0000000..c704dfa
--- /dev/null
+++ b/system/typemill/Static/Urlinfo.php
@@ -0,0 +1,106 @@
+withUserInfo('');
+ $uri = $uri->withPort(null);
+
+ $currentpath = $uri->getPath();
+ $route = str_replace($basepath, '', $currentpath);
+
+ $query = $uri->getQuery();
+ parse_str($query, $params);
+
+ # proxy detection
+ if(isset($settings['proxy']) && $settings['proxy'] && isset($_SERVER['HTTP_X_FORWARDED_HOST']))
+ {
+ $trustedProxies = ( isset($settings['trustedproxies']) && !empty($settings['trustedproxies']) ) ? explode(",", $settings['trustedproxies']) : [];
+
+ $proxyuri = self::updateUri($uri, $trustedProxies);
+
+ if($proxyuri)
+ {
+ # use uri from proxy
+ $uri = $proxyuri;
+
+ # standard basepath is empty
+ $basepath = "";
+
+ # if proxy has basepath, then
+ if (isset($_SERVER['HTTP_X_FORWARDED_PREFIX']))
+ {
+ # Use X-Forwarded-Prefix if available
+ $basepath = rtrim($_SERVER['HTTP_X_FORWARDED_PREFIX'], '/') . '/';
+ }
+ }
+ }
+
+ $scheme = $uri->getScheme();
+ $authority = $uri->getAuthority();
+ $protocol = ($scheme ? $scheme . ':' : '') . ($authority ? '//' . $authority : '');
+ $baseurl = $protocol . $basepath;
+ $currenturl = $baseurl . $route;
+
+ return [
+ 'basepath' => $basepath,
+ 'currentpath' => $currentpath,
+ 'route' => $route,
+ 'scheme' => $scheme,
+ 'authority' => $authority,
+ 'protocol' => $protocol,
+ 'baseurl' => $baseurl,
+ 'baseurlWithoutProxy' => false, # add the base url without proxy maybe needed for license?
+ 'currenturl' => $currenturl,
+ 'params' => $params
+ ];
+ }
+
+ private static function updateUri($uri, $trustedProxies)
+ {
+ # optionally check trusted proxies
+ $ipAddress = $_SERVER['REMOTE_ADDR'] ?? null;
+ if (
+ $ipAddress
+ && !empty($trustedProxies)
+ && !in_array($ipAddress, $trustedProxies)
+ )
+ {
+ return false;
+ }
+
+ # get scheme from proxy
+ $scheme = $_SERVER['HTTP_X_FORWARDED_PROTO'] ?? null;
+ if (
+ $scheme
+ && in_array($scheme, ['http', 'https'])
+ )
+ {
+ $uri = $uri->withScheme($scheme);
+ }
+
+ # get host from proxy
+ $host = $_SERVER['HTTP_X_FORWARDED_HOST'] ?? null;
+ if (
+ $host
+ )
+ {
+ $host = trim(current(explode(',', $host)));
+
+ $pos = strpos($host, ':');
+ if ($pos !== false)
+ {
+ $host = strstr($host, ':', true);
+ }
+ $uri = $uri->withHost($host);
+ }
+
+ return $uri;
+ }
+}
\ No newline at end of file
diff --git a/system/typemill/author/auth/authcode.twig b/system/typemill/author/auth/authcode.twig
new file mode 100644
index 0000000..90dc73f
--- /dev/null
+++ b/system/typemill/author/auth/authcode.twig
@@ -0,0 +1,104 @@
+{% extends 'layouts/layoutAuth.twig' %}
+
+{% block title %}Login Verification Code{% endblock %}
+
+{% block content %}
+
+
+
+
+
+
+ Login Verification Code
+
+ {{ translate('Enter the verification code from your email:') }}
+
+
+
+
+
+
+
+
+
+
+{% endblock %}
\ No newline at end of file
diff --git a/system/typemill/author/js/vue-forms.js b/system/typemill/author/js/vue-forms.js
index 5e4765f..b686dd3 100644
--- a/system/typemill/author/js/vue-forms.js
+++ b/system/typemill/author/js/vue-forms.js
@@ -32,14 +32,13 @@ app.component('component-textarea', {
+ @input="update($event, name)">{{ errors[name] }}
{{ $filters.translate(description) }}
`,
@@ -81,8 +80,7 @@ app.component('component-codearea', {
:name="name"
:placeholder="placeholder"
:value="value"
- @input="update($event, name)">
-
+ @input="update($event, name)">{{ errors[name] }}
@@ -141,7 +139,7 @@ app.component('component-select', {
@change="update($event,name)">
-
+ {{ errors[name] }}
{{ $filters.translate(description) }}
`,
@@ -173,7 +171,7 @@ app.component('component-checkbox', {
v-model="checked"
@change="update(checked, name)">
{{ $filters.translate(checkboxlabel) }}
-
+ {{ errors[name] }}
{{ $filters.translate(description) }}
`,
@@ -209,7 +207,7 @@ app.component('component-checkboxlist', {
v-model="checkedoptions"
@change="update(checkedoptions, name)">
{{ $filters.translate(option) }}
-
+ {{ errors[name] }}
{{ $filters.translate(description) }}
`,
@@ -249,7 +247,7 @@ app.component('component-radio', {
v-model="picked"
@change="update(picked, name)">
{{ $filters.translate(option) }}
-
+ {{ errors[name] }}
{{ $filters.translate(description) }}
`,
@@ -277,7 +275,7 @@ app.component('component-number', {
:name="name"
:placeholder="placeholder"
:value="value"
- @input="update($event, name)">
+ @input="update($event, name)">{{ errors[name] }}
{{ $filters.translate(description) }}
`,
@@ -308,7 +306,7 @@ app.component('component-date', {
:name="name"
:placeholder="placeholder"
:value="value"
- @input="update($event, name)">
+ @input="update($event, name)">{{ errors[name] }}
{{ $filters.translate(description) }}
@@ -342,7 +340,7 @@ app.component('component-email', {
:name="name"
:placeholder="placeholder"
:value="value"
- @input="update($event, name)">
+ @input="update($event, name)">{{ errors[name] }}
{{ $filters.translate(description) }}
@@ -375,7 +373,7 @@ app.component('component-tel', {
:name="name"
:placeholder="placeholder"
:value="value"
- @input="update($event, name)">
+ @input="update($event, name)">{{ errors[name] }}
{{ $filters.translate(description) }}
@@ -409,7 +407,7 @@ app.component('component-url', {
:name="name"
:placeholder="placeholder"
:value="value"
- @input="update($event, name)">
+ @input="update($event, name)">{{ errors[name] }}
{{ $filters.translate(description) }}
@@ -442,7 +440,7 @@ app.component('component-color', {
:name="name"
:placeholder="placeholder"
:value="value"
- @input="update($event, name)">
+ @input="update($event, name)">{{ errors[name] }}
{{ $filters.translate(description) }}
diff --git a/system/typemill/author/js/vue-license.js b/system/typemill/author/js/vue-license.js
index 6b077e4..4b178d0 100644
--- a/system/typemill/author/js/vue-license.js
+++ b/system/typemill/author/js/vue-license.js
@@ -43,35 +43,6 @@ const app = Vue.createApp({
-
`,
data() {
diff --git a/system/typemill/author/js/vue-system.js b/system/typemill/author/js/vue-system.js
index da87e5f..7a5b276 100644
--- a/system/typemill/author/js/vue-system.js
+++ b/system/typemill/author/js/vue-system.js
@@ -17,6 +17,13 @@ const app = Vue.createApp({
:userroles="userroles"
:value="formData[fieldname]"
v-bind="subfieldDefinition">
+
+
+
@@ -85,6 +92,32 @@ const app = Vue.createApp({
this.currentTab = tab;
this.reset();
},
+ testmail: function()
+ {
+ this.reset();
+ var self = this;
+
+ tmaxios.post('/api/v1/testmail',{
+ 'url': data.urlinfo.route,
+ })
+ .then(function (response)
+ {
+ self.messageClass = 'bg-teal-500';
+ self.message = response.data.message;
+ })
+ .catch(function (error)
+ {
+ if(error.response)
+ {
+ self.message = handleErrorMessage(error);
+ self.messageClass = 'bg-rose-500';
+ if(error.response.data.errors !== undefined)
+ {
+ self.errors = error.response.data.errors;
+ }
+ }
+ });
+ },
save: function()
{
this.reset();
@@ -109,7 +142,7 @@ const app = Vue.createApp({
self.errors = error.response.data.errors;
}
}
- });
+ });
},
reset: function()
{
diff --git a/system/typemill/author/system/license.twig b/system/typemill/author/system/license.twig
index c381395..f92624d 100644
--- a/system/typemill/author/system/license.twig
+++ b/system/typemill/author/system/license.twig
@@ -17,11 +17,4 @@
app.config.globalProperties.$filters = translatefilter;
app.mount('#license');
-
-
{% endblock %}
\ No newline at end of file
diff --git a/system/typemill/author/translations/de.yaml b/system/typemill/author/translations/de.yaml
index 9c6b71b..a2854b7 100644
--- a/system/typemill/author/translations/de.yaml
+++ b/system/typemill/author/translations/de.yaml
@@ -1,3 +1,5 @@
+# German (Deutsche)
+# Author: Sebastian Schürmanns
'-LICENSE_AND_YOUR_WEBSITE_MUST_RUN_UNDER_THE_DOMAIN_OF_YOUR_LICENSE.': '-Lizenz und die Webseite muss unter der Domain von der Lizenz laufen.'
'ACCESS_&_RIGHTS': 'Zugang & Rechte'
ACCESS_FOR: 'Zugang für'
diff --git a/system/typemill/author/translations/en.yaml b/system/typemill/author/translations/en.yaml
index f48e9b6..cdef239 100644
--- a/system/typemill/author/translations/en.yaml
+++ b/system/typemill/author/translations/en.yaml
@@ -1,3 +1,5 @@
+# English
+# Author: Sebastian Schuermanns
'-LICENSE_AND_YOUR_WEBSITE_MUST_RUN_UNDER_THE_DOMAIN_OF_YOUR_LICENSE.': ''
'ACCESS_&_RIGHTS': ''
ACCESS_FOR: ''
diff --git a/system/typemill/author/translations/fr.yaml b/system/typemill/author/translations/fr.yaml
index 927aaa2..a3cbb34 100644
--- a/system/typemill/author/translations/fr.yaml
+++ b/system/typemill/author/translations/fr.yaml
@@ -1,3 +1,5 @@
+# French (Français)
+# Author:
'-LICENSE_AND_YOUR_WEBSITE_MUST_RUN_UNDER_THE_DOMAIN_OF_YOUR_LICENSE.': ''
'ACCESS_&_RIGHTS': ''
ACCESS_FOR: ''
diff --git a/system/typemill/author/translations/it.yaml b/system/typemill/author/translations/it.yaml
index b940d41..bc42361 100644
--- a/system/typemill/author/translations/it.yaml
+++ b/system/typemill/author/translations/it.yaml
@@ -1,3 +1,5 @@
+# Italian (Italiano) pls ignore autoupdates
+# Author: Severo Iuliano (https://github.com/iusvar)
'-LICENSE_AND_YOUR_WEBSITE_MUST_RUN_UNDER_THE_DOMAIN_OF_YOUR_LICENSE.': ''
'ACCESS_&_RIGHTS': ''
ACCESS_FOR: ''
diff --git a/system/typemill/routes/api.php b/system/typemill/routes/api.php
index 05bd1bb..7abf57c 100644
--- a/system/typemill/routes/api.php
+++ b/system/typemill/routes/api.php
@@ -3,6 +3,7 @@
use Slim\Routing\RouteCollectorProxy;
use Typemill\Middleware\ApiAuthentication;
use Typemill\Middleware\ApiAuthorization;
+use Typemill\Middleware\CorsHeadersMiddleware;
use Typemill\Controllers\ControllerApiGlobals;
use Typemill\Controllers\ControllerApiMedia;
use Typemill\Controllers\ControllerApiSystemSettings;
@@ -18,6 +19,7 @@ use Typemill\Controllers\ControllerApiAuthorArticle;
use Typemill\Controllers\ControllerApiAuthorBlock;
use Typemill\Controllers\ControllerApiAuthorMeta;
use Typemill\Controllers\ControllerApiAuthorShortcode;
+use Typemill\Controllers\ControllerApiTestmail;
$app->group('/api/v1', function (RouteCollectorProxy $group) use ($acl) {
@@ -34,6 +36,7 @@ $app->group('/api/v1', function (RouteCollectorProxy $group) use ($acl) {
$group->post('/plugin', ControllerApiSystemPlugins::class . ':updatePlugin')->setName('api.plugin.set')->add(new ApiAuthorization($acl, 'system', 'update')); # admin
$group->post('/extensions', ControllerApiSystemExtensions::class . ':activateExtension')->setName('api.extension.activate')->add(new ApiAuthorization($acl, 'system', 'update')); # admin
$group->post('/versioncheck', ControllerApiSystemVersions::class . ':checkVersions')->setName('api.versioncheck')->add(new ApiAuthorization($acl, 'system', 'update')); # admin
+ $group->post('/testmail', ControllerApiTestmail::class . ':send')->setName('api.testmail')->add(new ApiAuthorization($acl, 'system', 'update')); # admin
$group->get('/users/getbynames', ControllerApiSystemUsers::class . ':getUsersByNames')->setName('api.usersbynames')->add(new ApiAuthorization($acl, 'user', 'update')); # admin
$group->get('/users/getbyemail', ControllerApiSystemUsers::class . ':getUsersByEmail')->setName('api.usersbyemail')->add(new ApiAuthorization($acl, 'user', 'update')); # admin
$group->get('/users/getbyrole', ControllerApiSystemUsers::class . ':getUsersByRole')->setName('api.usersbyrole')->add(new ApiAuthorization($acl, 'user', 'update')); # admin
@@ -85,13 +88,13 @@ $app->group('/api/v1', function (RouteCollectorProxy $group) use ($acl) {
$group->get('/meta', ControllerApiAuthorMeta::class . ':getMeta')->setName('api.meta.get')->add(new ApiAuthorization($acl, 'mycontent', 'view'));
$group->post('/meta', ControllerApiAuthorMeta::class . ':updateMeta')->setName('api.metadata.update')->add(new ApiAuthorization($acl, 'mycontent', 'update'));
-})->add(new ApiAuthentication());
+})->add(new CorsHeadersMiddleware($settings, $urlinfo))->add(new ApiAuthentication());
# api-routes from plugins
if(isset($routes['api']) && !empty($routes['api']))
{
foreach($routes['api'] as $pluginRoute)
- {
+ {
$method = $pluginRoute['httpMethod'] ?? false;
$route = $pluginRoute['route'] ?? false;
$class = $pluginRoute['class'] ?? false;
@@ -102,12 +105,12 @@ if(isset($routes['api']) && !empty($routes['api']))
if($resources && $privilege)
{
# protected api requires authentication and authorization
- $app->{$method}($route, $class)->setName($name)->add(new ApiAuthorization($acl, $resource, $privilege))->add(new ApiAuthentication());
+ $app->{$method}($route, $class)->setName($name)->add(new ApiAuthorization($acl, $resource, $privilege))->add(new CorsHeadersMiddleware($settings, $urlinfo))->add(new ApiAuthentication());
}
else
{
# public api routes
- $app->{$method}($route, $class)->setName($name);
+ $app->{$method}($route, $class)->setName($name)->add(new CorsHeadersMiddleware($settings, $urlinfo));
}
}
}
\ No newline at end of file
diff --git a/system/typemill/routes/web.php b/system/typemill/routes/web.php
index 18e1c89..037269d 100644
--- a/system/typemill/routes/web.php
+++ b/system/typemill/routes/web.php
@@ -4,6 +4,7 @@ use Slim\Routing\RouteCollectorProxy;
use Typemill\Middleware\WebRedirectIfAuthenticated;
use Typemill\Middleware\WebRedirectIfUnauthenticated;
use Typemill\Middleware\WebAuthorization;
+use Typemill\Middleware\CspHeadersMiddleware;
use Typemill\Controllers\ControllerWebSetup;
use Typemill\Controllers\ControllerWebAuth;
use Typemill\Controllers\ControllerWebRecover;
@@ -18,6 +19,11 @@ $app->group('/tm', function (RouteCollectorProxy $group) use ($settings) {
$group->get('/login', ControllerWebAuth::class . ':show')->setName('auth.show');
$group->post('/login', ControllerWebAuth::class . ':login')->setName('auth.login');
+ if(isset($settings['authcode']) && $settings['authcode'])
+ {
+ $group->post('/authcode', ControllerWebAuth::class . ':loginWithAuthcode')->setName('auth.authcode');
+ }
+
if(isset($settings['recoverpw']) && $settings['recoverpw'])
{
$group->get('/recover', ControllerWebRecover::class . ':showRecoverForm')->setName('auth.recoverform');
@@ -26,7 +32,7 @@ $app->group('/tm', function (RouteCollectorProxy $group) use ($settings) {
$group->post('/reset', ControllerWebRecover::class . ':resetPassword')->setName('auth.reset');
}
-})->add(new WebRedirectIfAuthenticated($routeParser, $settings));
+})->add(new CspHeadersMiddleware($settings, $cspFromPlugins, $cspFromTheme))->add(new WebRedirectIfAuthenticated($routeParser, $settings));
# AUTHOR AREA (requires authentication)
$app->group('/tm', function (RouteCollectorProxy $group) use ($routeParser,$acl) {
@@ -46,10 +52,11 @@ $app->group('/tm', function (RouteCollectorProxy $group) use ($routeParser,$acl)
$group->get('/content/visual[/{route:.*}]', ControllerWebAuthor::class . ':showBlox')->setName('content.visual')->add(new WebAuthorization($routeParser, $acl, 'mycontent', 'view'));
$group->get('/content/raw[/{route:.*}]', ControllerWebAuthor::class . ':showRaw')->setName('content.raw')->add(new WebAuthorization($routeParser, $acl, 'mycontent', 'view'));
-})->add(new WebRedirectIfUnauthenticated($routeParser));
+})->add(new CspHeadersMiddleware($settings, $cspFromPlugins, $cspFromTheme))->add(new WebRedirectIfUnauthenticated($routeParser));
$app->redirect('/tm', $routeParser->urlFor('auth.show'), 302);
$app->redirect('/tm/', $routeParser->urlFor('auth.show'), 302);
+$app->redirect('/tm/authcode', $routeParser->urlFor('auth.show'), 302);
# downloads
$app->get('/media/files[/{params:.*}]', ControllerWebDownload::class . ':download')->setName('download.file');
@@ -68,11 +75,11 @@ if(isset($routes['web']) && !empty($routes['web']))
if($resources && $privilege)
{
- $app->{$method}($route, $class)->setName($name)->add(new WebAuthorization($routeParser, $acl, $resource, $privilege))->add(new WebRedirectIfUnauthenticated($routeParser));
+ $app->{$method}($route, $class)->setName($name)->add(new CspHeadersMiddleware($settings, $cspFromPlugins, $cspFromTheme))->add(new WebAuthorization($routeParser, $acl, $resource, $privilege))->add(new WebRedirectIfUnauthenticated($routeParser));
}
else
{
- $app->{$method}($route, $class)->setName($name);
+ $app->{$method}($route, $class)->setName($name)->add(new CspHeadersMiddleware($settings, $cspFromPlugins, $cspFromTheme));
}
}
}
@@ -80,10 +87,10 @@ if(isset($routes['web']) && !empty($routes['web']))
if(isset($settings['access']) && $settings['access'] != '')
{
# if access for website is restricted
- $app->get('/[{route:.*}]', ControllerWebFrontend::class . ':index')->setName('home')->add(new WebAuthorization($routeParser, $acl, 'account', 'view'));
+ $app->get('/[{route:.*}]', ControllerWebFrontend::class . ':index')->setName('home')->add(new CspHeadersMiddleware($settings, $cspFromPlugins, $cspFromTheme))->add(new WebAuthorization($routeParser, $acl, 'account', 'view'));
}
else
{
# if access is not restricted
- $app->get('/[{route:.*}]', ControllerWebFrontend::class . ':index')->setName('home');
+ $app->get('/[{route:.*}]', ControllerWebFrontend::class . ':index')->setName('home')->add(new CspHeadersMiddleware($settings, $cspFromPlugins, $cspFromTheme));
}
diff --git a/system/typemill/settings/defaults.yaml b/system/typemill/settings/defaults.yaml
index 6123000..3fd0912 100644
--- a/system/typemill/settings/defaults.yaml
+++ b/system/typemill/settings/defaults.yaml
@@ -1,4 +1,4 @@
-version: '2.0.3'
+version: '2.1.0'
title: 'Typemill'
author: 'Unknown'
copyright: false
diff --git a/system/typemill/settings/metatabs.yaml b/system/typemill/settings/metatabs.yaml
index be5ee00..722bc48 100644
--- a/system/typemill/settings/metatabs.yaml
+++ b/system/typemill/settings/metatabs.yaml
@@ -78,20 +78,24 @@ meta:
hidden: true
css: hidden
pattern: '[0-9][0-9]-[0-9][0-9]-[0-9][0-9]'
-# fieldsetreference:
-# type: fieldset
-# legend: Reference
-# fields:
-# reference:
-# type: text
-# label: Reference to page
-# maxlength: 60
-# referencetype:
-# type: radio
-# label: Type of reference
-# options:
-# copy: Copy (copy the content of the referenced page)
-# redirect: Redirect (redirect the user to the referenced page)
+ fieldsetreference:
+ type: fieldset
+ legend: Reference
+ fields:
+ reference:
+ type: text
+ label: Reference to page
+ placeholder: '/path/to/internal/page or https://exgernal-page.org'
+ maxlength: 200
+ referencetype:
+ type: radio
+ label: Type of reference
+ options:
+ disable: Disable
+ redirect301: PERMANENT REDIRECT (301) the user to the referenced internal page
+ redirect302: TEMPORARY REDIRECT (302) the user to the referenced internal page
+ copy: COPY the content of the referenced internal page
+ outlink: LINK to an external page
fieldsetvisibility:
type: fieldset
legend: Visibility
diff --git a/system/typemill/settings/system.yaml b/system/typemill/settings/system.yaml
index 81a3e5b..f495185 100644
--- a/system/typemill/settings/system.yaml
+++ b/system/typemill/settings/system.yaml
@@ -4,19 +4,20 @@ fieldsetsystem:
fields:
title:
type: text
- label: Website title
+ label: 'Website title'
maxlength: 60
css: lg:w-half
author:
type: text
- label: Website owner
+ label: 'Website owner'
css: lg:w-half
maxlength: 60
copyright:
type: select
- label: Copyright
+ label: 'Copyright'
css: lg:w-half
maxlength: 60
+ description: 'Used for copyright and year in footer.'
options:
'©': '©'
'CC-BY': 'CC-BY'
@@ -30,11 +31,13 @@ fieldsetsystem:
label: Year
css: lg:w-half
maxlength: 4
+ description: 'Used for copyright and year in footer.'
language:
type: select
- label: Language (author area)
+ label: 'Language (author area)'
css: lg:w-half
maxlength: 60
+ description: 'Used for translations in author area, themes, and plugins.'
options:
'en': 'English'
'ru': 'Russian'
@@ -44,15 +47,16 @@ fieldsetsystem:
'fr': 'French'
langattr:
type: text
- label: Language attribute (website)
+ label: 'Language attribute (website)'
css: lg:w-half
maxlength: 5
- description: Please use ISO 639-1 codes like "en"
+ description: 'Used for frontend language attribute. Please use ISO 639-1 codes like "en".'
sitemap:
type: text
- label: Google sitemap (readonly)
+ label: 'Google sitemap (readonly)'
css: lg:w-half
disabled: true
+ description: 'Submit the url above in google search console to support indexing.'
fieldsetmedia:
type: fieldset
legend: Media
@@ -63,48 +67,48 @@ fieldsetmedia:
favicon:
type: image
label: Favicon
- description: Only PNG format will work.
+ description: 'Only PNG format will work.'
liveimagewidth:
type: number
- label: Standard width for live pictures
+ label: 'Standard width for live pictures'
placeholder: 820
- description: Default width of live images is 820px. Changes will apply to future uploads.
+ description: 'Default width of live images is 820px. Changes will apply to future uploads.'
css: lg:w-half
liveimageheight:
type: number
- label: Standard height for live pictures
- description: If you add a value for the height, then the image will be cropped.
+ label: 'Standard height for live pictures'
+ description: 'If you add a value for the height, then the image will be cropped.'
css: lg:w-half
maximageuploads:
type: number
- label: Maximum size for image uploads in MB
- description: The maximum image size might be limited by your server settings.
+ label: 'Maximum size for image uploads in MB'
+ description: 'The maximum image size might be limited by your server settings.'
allowsvg:
type: checkbox
label: Allow svg
- checkboxlabel: Allow the upload of svg images
+ checkboxlabel: 'Allow the upload of svg images'
convertwebp:
type: checkbox
- label: Convert to webp
- checkboxlabel: Try to convert uploaded images into the webp-format
+ label: 'Convert to webp'
+ checkboxlabel: 'Try to convert uploaded images into the webp-format for better performance.'
maxfileuploads:
type: number
- label: Maximum size for file uploads in MB
- description: The maximum file size might be limited by your server settings.
+ label: 'Maximum size for file uploads in MB'
+ description: 'The maximum file size might be limited by your server settings.'
fieldsetwriting:
type: fieldset
legend: Writing
fields:
editor:
type: radio
- label: Standard editor mode
+ label: 'Standard editor mode'
css: lg:w-half
options:
'visual': 'visual editor'
'raw': 'raw editor'
formats:
type: checkboxlist
- label: Format options for visual editor
+ label: 'Format options for visual editor'
css: lg:w-half
options:
'markdown': 'markdown'
@@ -124,12 +128,12 @@ fieldsetwriting:
'shortcode': 'shortcode'
headlineanchors:
type: checkbox
- label: Headline anchors
- checkboxlabel: Show anchors next to headline in frontend
+ label: 'Headline anchors'
+ checkboxlabel: 'Show anchors next to headline in frontend'
urlschemes:
type: text
- label: Url schemes
- description: Add more url schemes for external links e.g. like dict:// (comma separated list)
+ label: 'Url schemes'
+ description: 'Add more url schemes for external links e.g. like dict:// (comma separated list)'
maxlength: 60
fieldsetaccess:
type: fieldset
@@ -137,73 +141,120 @@ fieldsetaccess:
fields:
access:
type: checkbox
- label: Website restriction
- checkboxlabel: Show the website only to authenticated users and redirect all other users to the login page.
+ label: 'Website restriction'
+ checkboxlabel: 'Show the website only to authenticated users and redirect all other users to the login page.'
pageaccess:
type: checkbox
- label: Page restriction
- checkboxlabel: Activate individual restrictions for pages in the meta-tab of each page.
+ label: 'Page restriction'
+ checkboxlabel: 'Activate individual restrictions for pages in the meta-tab of each page.'
hrdelimiter:
type: checkbox
- label: Content break
- checkboxlabel: Cut restricted content after the first hr-element on a page (per default content will be cut after title).
+ label: 'Content break'
+ checkboxlabel: 'Cut restricted content after the first hr-element on a page (per default content will be cut after title).'
restrictionnotice:
type: textarea
- label: Restriction notice (use markdown)
+ label: 'Restriction notice (use markdown)'
maxlength: 2000
wraprestrictionnotice:
type: checkbox
- label: Wrap restriction notice
- checkboxlabel: Wrap the restriction notice above into a notice-4 element (which can be designed as special box)
+ label: 'Wrap restriction notice'
+ checkboxlabel: 'Wrap the restriction notice above into a notice-4 element (which can be designed as special box)'
+fieldsetmail:
+ type: fieldset
+ legend: Email
+ fields:
+ mailfrom:
+ type: email
+ label: 'Mail From (required)'
+ placeholder: sender@yourmail.org
+ maxlength: 100
+ description: 'Enter an email address that sends the e-mails (sender). The e-mail-feature will be used for recovery and verification e-mails. Send a testmail to your user-account to verify that you receive the e-mails.'
+ mailfromname:
+ type: text
+ label: 'Mail From Name (optional)'
+ placeholder: sender name
+ maxlength: 100
+ description: 'Optionally enter a name for the sender address. If not set, the from-address will be visible.'
+ replyto:
+ type: text
+ label: 'Reply To (optional)'
+ placeholder: noreply@yourmail.org
+ maxlength: 100
+ description: 'Optionally enter a "reply to" address for answers from the receiver. If not set, answers will go to the from-address.'
+fieldsetrecover:
+ type: fieldset
+ legend: Recover
+ fields:
+ recoverpw:
+ type: checkbox
+ label: 'Recover password'
+ checkboxlabel: 'Activate a password recovery in the login form.'
+ description: "From mail is required for this feature. Send a testmail before you use this feature."
+ recoversubject:
+ type: text
+ label: 'Email subject'
+ placeholder: 'Recover your password'
+ maxlength: 60
+ recovermessage:
+ type: textarea
+ label: 'Text before recover link in email message'
+ descriptiion: 'The recover-link will be active for 24 hours.'
+ maxlength: 2000
fieldsetsecurity:
type: fieldset
legend: Security
fields:
- securitylog:
+ authcode:
type: checkbox
- label: Security log
- checkboxlabel: Track spam and suspicious actions in a logfile
+ label: 'Login Verification (recommended)'
+ checkboxlabel: 'Verify your login with a 5-digit code send by email.'
+ description: 'From mail is required for this feature. Send a testmail before you use this feature. Make sure you have ftp-access to disable the feature in settings.yaml on failure. The verification code will be valid for 5 minutes. Be aware that device fingerprints will be stored in the user accounts.'
authcaptcha:
type: radio
- label: Use captcha in authentication forms
+ label: 'Use captcha in authentication forms'
options:
- disabled: Disable
- standard: Always show
- aftererror: Show after first wrong input
- recoverpw:
+ disabled: 'Disable'
+ standard: 'Always show'
+ aftererror: 'Show after first wrong input'
+ securitylog:
type: checkbox
- label: Recover password
- checkboxlabel: Activate the password recovery.
- recoverfrom:
- type: text
- label: Sender email
- placeholder: your@email.org
- maxlength: 60
- recoversubject:
- type: text
- label: Email subject
- placeholder: Recover your password
- maxlength: 60
- recovermessage:
- type: textarea
- label: Text before recover link in email message
- maxlength: 2000
+ label: 'Security log'
+ checkboxlabel: 'Track spam and suspicious actions in a logfile'
fieldsetdeveloper:
type: fieldset
- legend: Developer
+ legend: "Developer"
fields:
displayErrorDetails:
type: checkbox
- label: Error reporting
- checkboxlabel: Display application errors
+ label: "Error reporting"
+ checkboxlabel: "Display application errors"
twigcache:
type: checkbox
- label: Twig cache
- checkboxlabel: Activate the cache for twig templates
+ label: "Twig cache"
+ checkboxlabel: "Activate the cache for twig templates"
proxy:
type: checkbox
- label: Proxy
- checkboxlabel: Use x-forwarded-header.
+ label: "Proxy"
+ checkboxlabel: "Use x-forwarded-header"
trustedproxies:
type: text
- label: Trusted IPs for proxies (comma separated)
\ No newline at end of file
+ label: "Trusted IPs for proxies (comma separated)"
+ headersoff:
+ type: checkbox
+ label: "Disable Custom Headers"
+ checkboxlabel: "Disable all custom headers of Typemill (except cors) and send your own headers instead."
+ cspdisabled:
+ type: checkbox
+ label: "Disable CSP Headers"
+ checkboxlabel: "Disable all csp headers (content security policy) for this website."
+ cspdomains:
+ type: textarea
+ label: "Allowed Domains for Content on Typemill (CSP-Headers)"
+ placeholder: 'https://www.google.com,*google.com'
+ description: "List all domains, separated by commas, to allow content integration, such as iframes, on your Typemill website. Domains will be added to the csp-header. Usually done with plugins and themes, but add manually if something is blocked."
+ corsdomains:
+ type: textarea
+ label: "Allowed Domains for API-Access (CORS-Headers)"
+ placeholder: 'https://my-website-that-uses-the-api.org,https://another-website-using-the-api.org'
+ description: "List all domains, separated by comma, that should have access to the Typemill API. Domains will be added to the cors-header."
+
\ No newline at end of file
diff --git a/system/typemill/system.php b/system/typemill/system.php
index 157b64a..aa06a0c 100644
--- a/system/typemill/system.php
+++ b/system/typemill/system.php
@@ -16,11 +16,14 @@ use Typemill\Static\Plugins;
use Typemill\Static\Translations;
use Typemill\Static\Permissions;
use Typemill\Static\Helpers;
+use Typemill\Static\Urlinfo;
use Typemill\Events\OnSettingsLoaded;
use Typemill\Events\OnPluginsLoaded;
use Typemill\Events\OnSessionSegmentsLoaded;
use Typemill\Events\OnRolesPermissionsLoaded;
use Typemill\Events\OnResourcesLoaded;
+use Typemill\Events\OnCspLoaded;
+use Typemill\Middleware\RemoveCredentialsMiddleware;
use Typemill\Middleware\SessionMiddleware;
use Typemill\Middleware\OldInputMiddleware;
use Typemill\Middleware\ValidationErrorsMiddleware;
@@ -28,6 +31,7 @@ use Typemill\Middleware\JsonBodyParser;
use Typemill\Middleware\FlashMessages;
use Typemill\Middleware\AssetMiddleware;
use Typemill\Middleware\SecurityMiddleware;
+use Typemill\Middleware\CustomHeadersMiddleware;
use Typemill\Extensions\TwigCsrfExtension;
use Typemill\Extensions\TwigUrlExtension;
use Typemill\Extensions\TwigUserExtension;
@@ -48,14 +52,16 @@ ini_set('display_errors', 0);
ini_set('display_startup_errors', 0);
error_reporting(E_ALL);
+
/****************************
-* LOAD SETTINGS *
+* LOAD SETTINGS *
****************************/
$settingsModel = new Settings();
$settings = $settingsModel->loadSettings();
+
/****************************
* HANDLE DISPLAY ERRORS *
****************************/
@@ -65,19 +71,9 @@ if(isset($settings['displayErrorDetails']) && $settings['displayErrorDetails'])
# ini_set('display_startup_errors', 1);
}
-/****************************
-* ADD PATH-INFOS FOR LATER *
-****************************/
-
-# ADD THEM TO THE SETTINGS AND YOU HAVE THEM EVERYWHERE??
-$uriFactory = new UriFactory();
-$uri = $uriFactory->createFromGlobals($_SERVER);
-$urlinfo = Helpers::urlInfo($uri);
-
-$timer['settings'] = microtime(true);
/****************************
-* CREATE CONTAINER *
+* CREATE CONTAINER + APP *
****************************/
# https://www.slimframework.com/docs/v4/start/upgrade.html#changes-to-container
@@ -93,11 +89,40 @@ $routeParser = $app->getRouteCollector()->getRouteParser();
# add route parser to container to use named routes in controller
$container->set('routeParser', $routeParser);
-# set urlinfo
-$container->set('urlinfo', $urlinfo);
+
+/*******************************
+ * Basepath *
+ ******************************/
# in slim 4 you alsways have to set application basepath
-$app->setBasePath($urlinfo['basepath']);
+$basepath = preg_replace('/(.*)\/.*/', '$1', $_SERVER['SCRIPT_NAME']);
+$app->setBasePath($basepath);
+
+
+/****************
+* URLINFO *
+****************/
+
+# WE DO NOT NEED IT HERE?
+# WE CAN ADD IT TO CONTAINER IN MIDDLEWARE AFTER PROXY DETECTION
+
+# WE NEED FOR
+# - LICENSE (base url)
+# - Each plugin to add container
+# - SESSION SEGMEŃTS (route)
+# - TRANSLATIONS (route)
+# - ASSETS (route)
+# - TWIG URL EXTENSION
+# - SESSION MIDDLEWARE
+
+$uriFactory = new UriFactory();
+$uri = $uriFactory->createFromGlobals($_SERVER);
+$urlinfo = Urlinfo::getUrlInfo($basepath, $uri, $settings);
+
+$timer['settings'] = microtime(true);
+
+# set urlinfo
+$container->set('urlinfo', $urlinfo);
$timer['container'] = microtime(true);
@@ -304,6 +329,8 @@ foreach($middleware as $pluginMiddleware)
}
}
+$app->add(new CustomHeadersMiddleware($settings));
+
$app->add(new AssetMiddleware($assets, $container->get('view')));
$app->add(new ValidationErrorsMiddleware($container->get('view')));
@@ -312,11 +339,11 @@ $app->add(new SecurityMiddleware($routeParser, $container->get('settings')));
$app->add(new OldInputMiddleware($container->get('view')));
-$app->add(new FlashMessages($container));
-
# Add Twig-View Middleware
$app->add(TwigMiddleware::createFromContainer($app));
+$app->add(new FlashMessages($container));
+
# add JsonBodyParser Middleware
$app->add(new JsonBodyParser());
@@ -343,7 +370,9 @@ $errorMiddleware->setErrorHandler(HttpNotFoundException::class, function ($reque
$app->add($errorMiddleware);
-$app->add(new SessionMiddleware($session_segments, $urlinfo['route'], $uri));
+$app->add(new SessionMiddleware($session_segments, $urlinfo['route']));
+
+$app->add(new RemoveCredentialsMiddleware());
if(isset($settings['proxy']) && $settings['proxy'])
{
@@ -355,9 +384,25 @@ if(isset($settings['proxy']) && $settings['proxy'])
$timer['middleware'] = microtime(true);
+/******************************
+* GET CSP FROM PLUGINS/THEMES *
+******************************/
+
+# get additional csp headers from plugins
+$cspFromPlugins = $dispatcher->dispatch(new OnCspLoaded([]), 'onCspLoaded')->getData();
+
+# get additional csp headers from theme
+$cspFromTheme = [];
+$themeSettings = $settingsModel->getObjectSettings('themes', $settings['theme']);
+if(isset($themeSettings['csp']) && is_array($themeSettings['csp']) && !empty($themeSettings['csp']) )
+{
+ $cspFromTheme = $themeSettings['csp'];
+}
+
/************************
* ADD ROUTES *
************************/
+
if(isset($settings['setup']) && $settings['setup'] == true)
{
require __DIR__ . '/routes/setup.php';
@@ -370,6 +415,7 @@ else
$timer['routes'] = microtime(true);
+
/************************
* RUN APP *
************************/