diff options
author | sualko <klaus@jsxc.org> | 2022-01-04 17:04:18 +0300 |
---|---|---|
committer | sualko <klaus@jsxc.org> | 2022-01-04 17:04:18 +0300 |
commit | 92a94f7703abc5af1567186e676cb18a1ee55289 (patch) | |
tree | e96926e8dad914e03c9fe0830b624af111e9c5d1 /appinfo | |
parent | 05381e2bedb51b212c0280fc09279e37ccc7d198 (diff) |
fix: remove deprecated app.php
Diffstat (limited to 'appinfo')
-rwxr-xr-x | appinfo/app.php | 98 | ||||
-rwxr-xr-x | appinfo/info.xml | 5 |
2 files changed, 4 insertions, 99 deletions
diff --git a/appinfo/app.php b/appinfo/app.php deleted file mode 100755 index b97b168..0000000 --- a/appinfo/app.php +++ /dev/null @@ -1,98 +0,0 @@ -<?php - -use OCA\OJSXC\AppInfo\Application; -use OCA\OJSXC\Hooks; -use OCA\OJSXC\Config; - -$config = \OC::$server->getConfig(); -$versionHashSuffix = ''; - -if (!$config->getSystemValue('debug', false)) { - $appVersion = $config->getAppValue('ojsxc', 'installed_version'); - $versionHashSuffix = '?v=' . substr(md5($appVersion), 0, 8); -} - -function addScript($src) { - // use addHeader instead of addScript, because addScript adds js suffix to every src - \OCP\Util::addHeader( 'script', [ - 'src' => $src, - 'nonce' => \OC::$server->getContentSecurityPolicyNonceManager()->getNonce(), - ], '' - ); -} - -$urlGenerator = \OC::$server->getURLGenerator(); - -addScript($urlGenerator->linkToRoute('ojsxc.javascript.generalConfig')); -addScript($urlGenerator->linkTo('ojsxc', 'js/libsignal/libsignal-protocol.js') . $versionHashSuffix); -addScript($urlGenerator->linkTo('ojsxc', 'js/jsxc/jsxc.bundle.js') . $versionHashSuffix); -addScript($urlGenerator->linkTo('ojsxc', 'js/bundle.js') . $versionHashSuffix); - -// workaround to overwrite localStorage.clear -\OCP\Util::addScript( 'ojsxc', 'overwriteClearStorage', true ); - -\OCP\Util::addStyle ( 'ojsxc', '../js/jsxc/styles/jsxc.bundle' ); -\OCP\Util::addStyle ( 'ojsxc', 'bundle' ); - -$dispatcher = \OC::$server->getEventDispatcher(); -$dispatcher->addListener(\OCP\Security\FeaturePolicy\AddFeaturePolicyEvent::class, function (\OCP\Security\FeaturePolicy\AddFeaturePolicyEvent $e) { - $fp = new \OCP\AppFramework\Http\EmptyFeaturePolicy(); - - $fp->addAllowedGeoLocationDomain('\'self\''); - $fp->addAllowedCameraDomain('\'self\''); - $fp->addAllowedFullScreenDomain('\'self\''); - $fp->addAllowedMicrophoneDomain('\'self\''); - - $e->addPolicy($fp); -}); - -if(class_exists('\\OCP\\AppFramework\\Http\\EmptyContentSecurityPolicy')) { - $manager = \OC::$server->getContentSecurityPolicyManager(); - $policy = new \OCP\AppFramework\Http\EmptyContentSecurityPolicy(); - - $policy->addAllowedStyleDomain('\'self\''); - $policy->addAllowedStyleDomain('\'unsafe-inline\''); - - $policy->addAllowedScriptDomain('\'self\''); - - if ($config->getSystemValue('jsxc.environment', 'production') === 'development') { - // required for source maps - $policy->addAllowedScriptDomain('\'unsafe-eval\''); - } - - $policy->addAllowedImageDomain('\'self\''); - $policy->addAllowedImageDomain('data:'); - $policy->addAllowedImageDomain('blob:'); - - $policy->addAllowedMediaDomain('\'self\''); - $policy->addAllowedMediaDomain('blob:'); - - $policy->addAllowedChildSrcDomain('\'self\''); - - $policy->addAllowedConnectDomain('\'self\''); - - $boshUrl = \OC::$server->getConfig()->getAppValue('ojsxc', Config::XMPP_URL); - - if(preg_match('#^(https?:)?//([a-z0-9][a-z0-9\-.]*[a-z0-9](:[0-9]+)?)/#i', $boshUrl, $matches)) { - $boshDomain = $matches[2]; - - $policy->addAllowedConnectDomain($boshDomain); - } - - $externalServices = \OC::$server->getConfig()->getAppValue('ojsxc', Config::EXTERNAL_SERVICES); - $externalServices = explode("|", $externalServices); - - foreach($externalServices as $es) { - $policy->addAllowedConnectDomain($es); - } - - $manager->addDefaultPolicy($policy); -} - -$apiSecret = $config->getAppValue('ojsxc', Config::API_SECRET); -if(!$apiSecret) { - $apiSecret = \OC::$server->getSecureRandom()->generate(23); - $config->setAppValue('ojsxc', Config::API_SECRET, $apiSecret); -} - -?> diff --git a/appinfo/info.xml b/appinfo/info.xml index d30eef4..b4fbf82 100755 --- a/appinfo/info.xml +++ b/appinfo/info.xml @@ -46,10 +46,13 @@ <lib>xmlreader</lib> <lib>xmlwriter</lib> <lib>dom</lib> - <nextcloud min-version="19" max-version="21"/> + <nextcloud min-version="20" max-version="21"/> </dependencies> <repair-steps> + <install> + <step>OCA\OJSXC\Migration\InitApiSecret</step> + </install> <post-migration> <step>OCA\OJSXC\Migration\MigrateConfig</step> </post-migration> |