diff --git a/.woodpecker/.publish.yml b/.woodpecker/.publish.yml index ac39564..c42146a 100644 --- a/.woodpecker/.publish.yml +++ b/.woodpecker/.publish.yml @@ -32,7 +32,7 @@ steps: - echo "$APP_CERTIFICATE" > "/tmp/side_menu.key" - echo "$APP_PUBLIC_CERTIFICATE" > "/tmp/side_menu.crt" - mkdir /tmp/app - - cp -r README.md CHANGELOG.md appinfo lib img l10n js src templates screenshots vendor /tmp/app + - cp -r README.md CHANGELOG.md appinfo css lib img l10n js src templates screenshots vendor /tmp/app - /usr/src/nextcloud/occ integrity:sign-app --privateKey=/tmp/side_menu.key --certificate=/tmp/side_menu.crt diff --git a/CHANGELOG.md b/CHANGELOG.md index f96bb7d..585c860 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,47 +1,5 @@ ## [Unreleased] -## 5.1.1 -### Fixed -* fix(build): define appName to fix this error: "The `@nextcloud/vue` library was used without setting / replacing the `appName`" -* fix #349: add custom controller to retrieve core apps - -## 5.1.0 -### Added -* fix #425: allow to set a color using hex code -### Fixed -* #422: usage of `OC\AppFramework\Http\Request` instead of `$_SERVER` - -## 5.0.3 -### Fixed -* fix #422: undefined array key "HTTP_USER_AGENT" - -## 5.0.2 -### Fixed -* fix #413: add user-agent check for memories mobile app -* fix #418: allow non admin user to access their settings - -## 5.0.1 -### Fixed -* fix(StandardMenu): appLimit must return a value > 0 - -## 5.0.0 -### Fixed -* fix apps's order in the standard menu -### Added -* add new translations -* add route `/apps/side_menu/user/config` -* add new UI for admin and personals settings -### Changed -* migrate to Vue 3 and so add/update or remove dependencies -* replace CSS with SCSS -* remove route `/apps/side_menu/js/script` -* remove generated Javascript using PHP -* rewrite the standard menu of Nextcloud -### Security -* fix CVE-2023-44270 -* fix CVE-2024-9506 -* fix CVE-2024-6783 - ## 4.1.1 ### Fixed * fix(CssController): add missing NoCSRFRequired import (#397) diff --git a/Makefile b/Makefile index 883cccb..7803a58 100644 --- a/Makefile +++ b/Makefile @@ -20,7 +20,7 @@ release: test -d $$RELEASE_DIRECTORY/$$VERSION && rm -fr $$RELEASE_DIRECTORY/$$VERSION mkdir -p $$RELEASE_DIRECTORY/$$VERSION/side_menu - cp -r README.md CHANGELOG.md appinfo lib img l10n js src templates screenshots vendor $$RELEASE_DIRECTORY/$$VERSION/side_menu + cp -r README.md CHANGELOG.md appinfo css lib img l10n js src templates screenshots vendor $$RELEASE_DIRECTORY/$$VERSION/side_menu cd $$RELEASE_DIRECTORY/$$VERSION zip -r side_menu_v$$VERSION.zip side_menu tar cvzf side_menu_v$$VERSION.tar.gz side_menu diff --git a/README.md b/README.md index 48614bf..bf8abbb 100644 --- a/README.md +++ b/README.md @@ -24,7 +24,8 @@ You like this app and you want to support me? ☕ [Buy me a coffee](https://www. Requirements ------------ -* PHP >= 8.1 +* PHP >= 8.0 +* App `theming` enabled Installation and upgrade ------------------------ @@ -40,7 +41,7 @@ If you want to install it from source, go to https://gitnet.fr/deblan/side_menu/ ``` $ cd /path/to/nextcloud/apps -$ VERSION=x.y.z; curl -sS https://gitnet.fr/deblan/side_menu/releases/download/v${VERSION}/side_menu_v${VERSION}.tar.gz | tar xvfz - +$ curl -sS https://gitnet.fr/attachments/xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx | tar xvfz - ``` Administrators can edit many settings using the administration page. diff --git a/appinfo/info.xml b/appinfo/info.xml index e5a95b2..d6a0f5f 100644 --- a/appinfo/info.xml +++ b/appinfo/info.xml @@ -10,13 +10,14 @@ This application is rather suitable for instances that activate a lot of applica Use the shortcut `Ctrl`+`o` to open and to hide the side menu. Use `tab` to navigate. -You can customize colors depending of the theme. +You can customize colors depending of the theme (Dark theme and Breeze Dark). -To report a bug or request a feature, please open an issue. +You can report a bug or request a feature by opening an issue. Requirements: * PHP >= 8.1 +* App `theming` enabled If you like this application and if you want to support the development: @@ -30,7 +31,7 @@ Notice Because I believe in a free and decentralized Internet, [Gitnet](https://gitnet.fr) is **self-hosted at home**. In case of downtime, you can download **Custom Menu** from [here](https://kim.deblan.fr/~side_menu/). ]]> - 5.1.1 + 4.1.1 agpl Simon Vieille SideMenu @@ -53,7 +54,7 @@ In case of downtime, you can download **Custom Menu** from [here](https://kim.de - + OCA\SideMenu\Settings\Admin diff --git a/lib/AppInfo/Application.php b/lib/AppInfo/Application.php index 0f73c70..906bb71 100644 --- a/lib/AppInfo/Application.php +++ b/lib/AppInfo/Application.php @@ -2,9 +2,8 @@ namespace OCA\SideMenu\AppInfo; -use OC\AllConfig; +use OC; use OC\App\AppStore\Fetcher\CategoryFetcher; -use OC\AppFramework\Http\Request; use OC\Security\CSP\ContentSecurityPolicyNonceManager; use OC\User\User; use OCA\SideMenu\Service\AppRepository; @@ -32,12 +31,23 @@ use Psr\Container\ContainerInterface; class Application extends App implements IBootstrap { public const APP_ID = 'side_menu'; + public const APP_NAME = 'Custom menu'; - protected AllConfig $config; - protected ContentSecurityPolicyNonceManager $cspnm; - protected Request $request; - protected ?User $user = null; + /** + * @var OC\AllConfig + */ + protected $config; + + /** + * @var ContentSecurityPolicyNonceManager + */ + protected $cspnm; + + /** + * @var User + */ + protected $user; public function __construct(array $urlParams = []) { @@ -86,7 +96,6 @@ class Application extends App implements IBootstrap $this->config = \OC::$server->getConfig(); $this->cspnm = \OC::$server->getContentSecurityPolicyNonceManager(); $this->user = \OC::$server[IUserSession::class]->getUser(); - $this->request = \OC::$server->getRequest(); if (!$this->isEnabled()) { return; @@ -97,10 +106,6 @@ class Application extends App implements IBootstrap protected function isEnabled(): bool { - if (isset($this->request->server['HTTP_USER_AGENT']) && preg_match('/MemoriesNative/', $this->request->server['HTTP_USER_AGENT'])) { - return false; - } - $enabled = true; $isForced = (bool) $this->config->getAppValue(self::APP_ID, 'force', '0'); @@ -123,6 +128,7 @@ class Application extends App implements IBootstrap protected function addAssets() { Util::addScript(self::APP_ID, 'side_menu-menu'); + // Util::addStyle(self::APP_ID, 'sideMenu'); $assets = [ 'stylesheet' => [ @@ -133,6 +139,14 @@ class Application extends App implements IBootstrap 'rel' => 'stylesheet', ], ], + // 'script' => [ + // 'route' => 'side_menu.Js.script', + // 'type' => 'script', + // 'route_attr' => 'src', + // 'attr' => [ + // 'nonce' => $this->cspnm->getNonce(), + // ], + // ], ]; $cache = $this->config->getAppValue(self::APP_ID, 'cache', '0'); diff --git a/lib/Controller/CoreController.php b/lib/Controller/CoreController.php deleted file mode 100644 index 9302ef3..0000000 --- a/lib/Controller/CoreController.php +++ /dev/null @@ -1,74 +0,0 @@ -. - */ - -namespace OCA\SideMenu\Controller; - -use OCA\SideMenu\Service\AppRepository; -use OCA\SideMenu\Service\ConfigProxy; -use OCP\AppFramework\Controller; -use OCP\AppFramework\Http\Attribute\FrontpageRoute; -use OCP\AppFramework\Http\Attribute\NoAdminRequired; -use OCP\AppFramework\Http\Attribute\NoCSRFRequired; -use OCP\AppFramework\Http\Attribute\PublicPage; -use OCP\AppFramework\Http\JSONResponse; -use OCP\IRequest; -use OCP\IUserSession; - -class CoreController extends Controller -{ - public function __construct( - string $appName, - IRequest $request, - protected ConfigProxy $config, - protected AppRepository $appRepository, - ) { - parent::__construct($appName, $request); - } - - #[NoCSRFRequired] - #[NoAdminRequired] - #[PublicPage] - #[FrontpageRoute(verb: 'GET', url: '/core/apps')] - public function items(): JSONResponse - { - $user = \OC::$server[IUserSession::class]->getUser(); - $items = []; - - if (!$user) { - return new JSONResponse([ - 'items' => $items, - ]); - } - - $apps = $this->appRepository->getOrderedApps($user); - $keys = ['id', 'name', 'category', 'href', 'icon']; - - foreach ($apps as &$app) { - foreach ($app as $key => $value) { - if (!in_array($key, $keys)) { - unset($app[$key]); - } - } - } - - return new JSONResponse([ - 'items' => $apps, - ]); - } -} diff --git a/lib/Controller/JsController.php b/lib/Controller/JsController.php index 302de3d..f8c6228 100644 --- a/lib/Controller/JsController.php +++ b/lib/Controller/JsController.php @@ -20,6 +20,7 @@ namespace OCA\SideMenu\Controller; use OC\User\User; +use OCA\SideMenu\AppInfo\Application; use OCA\SideMenu\Service\ConfigProxy; use OCA\Theming\ThemingDefaults; use OCP\AppFramework\Controller; @@ -28,12 +29,10 @@ use OCP\AppFramework\Http\Attribute\NoAdminRequired; use OCP\AppFramework\Http\Attribute\NoCSRFRequired; use OCP\AppFramework\Http\Attribute\PublicPage; use OCP\AppFramework\Http\JSONResponse; +use OCP\AppFramework\Http\TemplateResponse; use OCP\IRequest; use OCP\IUserSession; use OCP\L10N\IFactory; -use OCP\IAvatarManager; -use OCP\INavigationManager; -use OCP\IURLGenerator; class JsController extends Controller { @@ -45,13 +44,26 @@ class JsController extends Controller protected ConfigProxy $config, protected ThemingDefaults $themingDefaults, protected IFactory $l10nFactory, - protected IAvatarManager $avatarManager, - protected IUserSession $userSession, - protected INavigationManager $navigationManager, - protected IURLGenerator $urlGenerator, ) { parent::__construct($appName, $request); - $this->user = $this->userSession->getUser(); + + $this->themingDefaults = $themingDefaults; + + $this->user = \OC::$server[IUserSession::class]->getUser(); + $this->config = $config; + $this->l10nFactory = $l10nFactory; + } + + #[NoCSRFRequired] + #[NoAdminRequired] + #[PublicPage] + #[FrontpageRoute(verb: 'GET', url: '/js/script')] + public function script(): TemplateResponse + { + $response = new TemplateResponse(Application::APP_ID, 'js/script', $this->getConfig(), 'blank'); + $response->addHeader('Content-Type', 'text/javascript'); + + return $response; } #[NoCSRFRequired] @@ -99,25 +111,25 @@ class JsController extends Controller $targetBlankApps = $userTargetBlankApps; } - $isAvatarSet = $this->avatarManager->getAvatar($this->user->getUID())->exists(); + $isAvatarSet = \OC::$server->getAvatarManager()->getAvatar($this->user->getUid())->exists(); if ($useAvatar && $isAvatarSet) { - $avatar = $this->urlGenerator->linkToRoute('core.avatar.getAvatar', [ - 'userId' => $this->user->getUID(), + $avatar = \OC::$server->getURLGenerator()->linkToRoute('core.avatar.getAvatar', [ + 'userId' => $this->user->getUid(), 'size' => 128, 'v' => $this->config->getUserValueInt($this->user, 'avatar', 'version', 0), ]); } if ($this->config->getAppValueBool('show-settings', '0')) { - $settingsNav = $this->navigationManager->getAll('settings'); + $settingsNav = \OC::$server->getNavigationManager()->getAll('settings'); if (isset($settingsNav['settings'])) { $settings = [ 'href' => $settingsNav['settings']['href'], 'name' => $settingsNav['settings']['name'], - 'avatar' => $this->urlGenerator->linkToRoute('core.avatar.getAvatar', [ - 'userId' => $this->user->getUID(), + 'avatar' => \OC::$server->getURLGenerator()->linkToRoute('core.avatar.getAvatar', [ + 'userId' => $this->user->getUid(), 'size' => 32, 'v' => $this->config->getUserValueInt($this->user, 'avatar', 'version', 0), ]), @@ -126,7 +138,7 @@ class JsController extends Controller } } - $indexUrl = $this->urlGenerator->linkTo('', 'index.php'); + $indexUrl = \OC::$server->getURLGenerator()->linkTo('', 'index.php'); return [ 'opener-position' => $this->config->getAppValue('opener-position', 'before'), diff --git a/lib/Controller/PersonalSettingController.php b/lib/Controller/PersonalSettingController.php index 285f89c..9b63576 100644 --- a/lib/Controller/PersonalSettingController.php +++ b/lib/Controller/PersonalSettingController.php @@ -98,7 +98,6 @@ class PersonalSettingController extends Controller } #[NoCSRFRequired] - #[NoAdminRequired] #[FrontpageRoute(verb: 'GET', url: '/user/config')] public function configuration(): JSONResponse { diff --git a/screenshots/admin_settings.png b/screenshots/admin_settings.png index eae14bb..4d7a0e0 100644 Binary files a/screenshots/admin_settings.png and b/screenshots/admin_settings.png differ diff --git a/screenshots/personal_settings.png b/screenshots/personal_settings.png index 480063b..05a73ee 100644 Binary files a/screenshots/personal_settings.png and b/screenshots/personal_settings.png differ diff --git a/src/components/settings/form/FormColorPicker.vue b/src/components/settings/form/FormColorPicker.vue index 904fa95..d13d578 100644 --- a/src/components/settings/form/FormColorPicker.vue +++ b/src/components/settings/form/FormColorPicker.vue @@ -17,7 +17,6 @@ along with this program. If not, see .