@@ -31,127 +31,127 @@ |
||
31 | 31 | |
32 | 32 | class AppConfigController extends OCSController { |
33 | 33 | |
34 | - /** @var IConfig */ |
|
35 | - protected $config; |
|
36 | - |
|
37 | - /** @var IAppConfig */ |
|
38 | - protected $appConfig; |
|
39 | - |
|
40 | - /** |
|
41 | - * @param string $appName |
|
42 | - * @param IRequest $request |
|
43 | - * @param IConfig $config |
|
44 | - * @param IAppConfig $appConfig |
|
45 | - */ |
|
46 | - public function __construct($appName, |
|
47 | - IRequest $request, |
|
48 | - IConfig $config, |
|
49 | - IAppConfig $appConfig) { |
|
50 | - parent::__construct($appName, $request); |
|
51 | - $this->config = $config; |
|
52 | - $this->appConfig = $appConfig; |
|
53 | - } |
|
54 | - |
|
55 | - /** |
|
56 | - * @return DataResponse |
|
57 | - */ |
|
58 | - public function getApps() { |
|
59 | - return new DataResponse([ |
|
60 | - 'data' => $this->appConfig->getApps(), |
|
61 | - ]); |
|
62 | - } |
|
63 | - |
|
64 | - /** |
|
65 | - * @param string $app |
|
66 | - * @return DataResponse |
|
67 | - */ |
|
68 | - public function getKeys($app) { |
|
69 | - try { |
|
70 | - $this->verifyAppId($app); |
|
71 | - } catch (\InvalidArgumentException $e) { |
|
72 | - return new DataResponse(['data' => ['message' => $e->getMessage()]], Http::STATUS_FORBIDDEN); |
|
73 | - } |
|
74 | - return new DataResponse([ |
|
75 | - 'data' => $this->config->getAppKeys($app), |
|
76 | - ]); |
|
77 | - } |
|
78 | - |
|
79 | - /** |
|
80 | - * @param string $app |
|
81 | - * @param string $key |
|
82 | - * @param string $defaultValue |
|
83 | - * @return DataResponse |
|
84 | - */ |
|
85 | - public function getValue($app, $key, $defaultValue = '') { |
|
86 | - try { |
|
87 | - $this->verifyAppId($app); |
|
88 | - } catch (\InvalidArgumentException $e) { |
|
89 | - return new DataResponse(['data' => ['message' => $e->getMessage()]], Http::STATUS_FORBIDDEN); |
|
90 | - } |
|
91 | - return new DataResponse([ |
|
92 | - 'data' => $this->config->getAppValue($app, $key, $defaultValue), |
|
93 | - ]); |
|
94 | - } |
|
95 | - |
|
96 | - /** |
|
97 | - * @PasswordConfirmationRequired |
|
98 | - * @param string $app |
|
99 | - * @param string $key |
|
100 | - * @param string $value |
|
101 | - * @return DataResponse |
|
102 | - */ |
|
103 | - public function setValue($app, $key, $value) { |
|
104 | - try { |
|
105 | - $this->verifyAppId($app); |
|
106 | - $this->verifyConfigKey($app, $key); |
|
107 | - } catch (\InvalidArgumentException $e) { |
|
108 | - return new DataResponse(['data' => ['message' => $e->getMessage()]], Http::STATUS_FORBIDDEN); |
|
109 | - } |
|
110 | - |
|
111 | - $this->config->setAppValue($app, $key, $value); |
|
112 | - return new DataResponse(); |
|
113 | - } |
|
114 | - |
|
115 | - /** |
|
116 | - * @PasswordConfirmationRequired |
|
117 | - * @param string $app |
|
118 | - * @param string $key |
|
119 | - * @return DataResponse |
|
120 | - */ |
|
121 | - public function deleteKey($app, $key) { |
|
122 | - try { |
|
123 | - $this->verifyAppId($app); |
|
124 | - $this->verifyConfigKey($app, $key); |
|
125 | - } catch (\InvalidArgumentException $e) { |
|
126 | - return new DataResponse(['data' => ['message' => $e->getMessage()]], Http::STATUS_FORBIDDEN); |
|
127 | - } |
|
128 | - |
|
129 | - $this->config->deleteAppValue($app, $key); |
|
130 | - return new DataResponse(); |
|
131 | - } |
|
132 | - |
|
133 | - /** |
|
134 | - * @param string $app |
|
135 | - * @throws \InvalidArgumentException |
|
136 | - */ |
|
137 | - protected function verifyAppId($app) { |
|
138 | - if (\OC_App::cleanAppId($app) !== $app) { |
|
139 | - throw new \InvalidArgumentException('Invalid app id given'); |
|
140 | - } |
|
141 | - } |
|
142 | - |
|
143 | - /** |
|
144 | - * @param string $app |
|
145 | - * @param string $key |
|
146 | - * @throws \InvalidArgumentException |
|
147 | - */ |
|
148 | - protected function verifyConfigKey($app, $key) { |
|
149 | - if (in_array($key, ['installed_version', 'enabled', 'types'])) { |
|
150 | - throw new \InvalidArgumentException('The given key can not be set'); |
|
151 | - } |
|
152 | - |
|
153 | - if ($app === 'core' && (strpos($key, 'public_') === 0 || strpos($key, 'remote_') === 0)) { |
|
154 | - throw new \InvalidArgumentException('The given key can not be set'); |
|
155 | - } |
|
156 | - } |
|
34 | + /** @var IConfig */ |
|
35 | + protected $config; |
|
36 | + |
|
37 | + /** @var IAppConfig */ |
|
38 | + protected $appConfig; |
|
39 | + |
|
40 | + /** |
|
41 | + * @param string $appName |
|
42 | + * @param IRequest $request |
|
43 | + * @param IConfig $config |
|
44 | + * @param IAppConfig $appConfig |
|
45 | + */ |
|
46 | + public function __construct($appName, |
|
47 | + IRequest $request, |
|
48 | + IConfig $config, |
|
49 | + IAppConfig $appConfig) { |
|
50 | + parent::__construct($appName, $request); |
|
51 | + $this->config = $config; |
|
52 | + $this->appConfig = $appConfig; |
|
53 | + } |
|
54 | + |
|
55 | + /** |
|
56 | + * @return DataResponse |
|
57 | + */ |
|
58 | + public function getApps() { |
|
59 | + return new DataResponse([ |
|
60 | + 'data' => $this->appConfig->getApps(), |
|
61 | + ]); |
|
62 | + } |
|
63 | + |
|
64 | + /** |
|
65 | + * @param string $app |
|
66 | + * @return DataResponse |
|
67 | + */ |
|
68 | + public function getKeys($app) { |
|
69 | + try { |
|
70 | + $this->verifyAppId($app); |
|
71 | + } catch (\InvalidArgumentException $e) { |
|
72 | + return new DataResponse(['data' => ['message' => $e->getMessage()]], Http::STATUS_FORBIDDEN); |
|
73 | + } |
|
74 | + return new DataResponse([ |
|
75 | + 'data' => $this->config->getAppKeys($app), |
|
76 | + ]); |
|
77 | + } |
|
78 | + |
|
79 | + /** |
|
80 | + * @param string $app |
|
81 | + * @param string $key |
|
82 | + * @param string $defaultValue |
|
83 | + * @return DataResponse |
|
84 | + */ |
|
85 | + public function getValue($app, $key, $defaultValue = '') { |
|
86 | + try { |
|
87 | + $this->verifyAppId($app); |
|
88 | + } catch (\InvalidArgumentException $e) { |
|
89 | + return new DataResponse(['data' => ['message' => $e->getMessage()]], Http::STATUS_FORBIDDEN); |
|
90 | + } |
|
91 | + return new DataResponse([ |
|
92 | + 'data' => $this->config->getAppValue($app, $key, $defaultValue), |
|
93 | + ]); |
|
94 | + } |
|
95 | + |
|
96 | + /** |
|
97 | + * @PasswordConfirmationRequired |
|
98 | + * @param string $app |
|
99 | + * @param string $key |
|
100 | + * @param string $value |
|
101 | + * @return DataResponse |
|
102 | + */ |
|
103 | + public function setValue($app, $key, $value) { |
|
104 | + try { |
|
105 | + $this->verifyAppId($app); |
|
106 | + $this->verifyConfigKey($app, $key); |
|
107 | + } catch (\InvalidArgumentException $e) { |
|
108 | + return new DataResponse(['data' => ['message' => $e->getMessage()]], Http::STATUS_FORBIDDEN); |
|
109 | + } |
|
110 | + |
|
111 | + $this->config->setAppValue($app, $key, $value); |
|
112 | + return new DataResponse(); |
|
113 | + } |
|
114 | + |
|
115 | + /** |
|
116 | + * @PasswordConfirmationRequired |
|
117 | + * @param string $app |
|
118 | + * @param string $key |
|
119 | + * @return DataResponse |
|
120 | + */ |
|
121 | + public function deleteKey($app, $key) { |
|
122 | + try { |
|
123 | + $this->verifyAppId($app); |
|
124 | + $this->verifyConfigKey($app, $key); |
|
125 | + } catch (\InvalidArgumentException $e) { |
|
126 | + return new DataResponse(['data' => ['message' => $e->getMessage()]], Http::STATUS_FORBIDDEN); |
|
127 | + } |
|
128 | + |
|
129 | + $this->config->deleteAppValue($app, $key); |
|
130 | + return new DataResponse(); |
|
131 | + } |
|
132 | + |
|
133 | + /** |
|
134 | + * @param string $app |
|
135 | + * @throws \InvalidArgumentException |
|
136 | + */ |
|
137 | + protected function verifyAppId($app) { |
|
138 | + if (\OC_App::cleanAppId($app) !== $app) { |
|
139 | + throw new \InvalidArgumentException('Invalid app id given'); |
|
140 | + } |
|
141 | + } |
|
142 | + |
|
143 | + /** |
|
144 | + * @param string $app |
|
145 | + * @param string $key |
|
146 | + * @throws \InvalidArgumentException |
|
147 | + */ |
|
148 | + protected function verifyConfigKey($app, $key) { |
|
149 | + if (in_array($key, ['installed_version', 'enabled', 'types'])) { |
|
150 | + throw new \InvalidArgumentException('The given key can not be set'); |
|
151 | + } |
|
152 | + |
|
153 | + if ($app === 'core' && (strpos($key, 'public_') === 0 || strpos($key, 'remote_') === 0)) { |
|
154 | + throw new \InvalidArgumentException('The given key can not be set'); |
|
155 | + } |
|
156 | + } |
|
157 | 157 | } |
@@ -5,7 +5,7 @@ |
||
5 | 5 | use OCP\AppFramework\Http; |
6 | 6 | |
7 | 7 | class NotSubAdminException extends \Exception { |
8 | - public function __construct() { |
|
9 | - parent::__construct('Logged in user must be at least a sub admin', Http::STATUS_FORBIDDEN); |
|
10 | - } |
|
8 | + public function __construct() { |
|
9 | + parent::__construct('Logged in user must be at least a sub admin', Http::STATUS_FORBIDDEN); |
|
10 | + } |
|
11 | 11 | } |
12 | 12 | \ No newline at end of file |
@@ -10,55 +10,55 @@ |
||
10 | 10 | |
11 | 11 | class ProvisioningApiMiddleware extends Middleware { |
12 | 12 | |
13 | - /** @var IControllerMethodReflector */ |
|
14 | - private $reflector; |
|
13 | + /** @var IControllerMethodReflector */ |
|
14 | + private $reflector; |
|
15 | 15 | |
16 | - /** @var bool */ |
|
17 | - private $isAdmin; |
|
16 | + /** @var bool */ |
|
17 | + private $isAdmin; |
|
18 | 18 | |
19 | - /** @var bool */ |
|
20 | - private $isSubAdmin; |
|
19 | + /** @var bool */ |
|
20 | + private $isSubAdmin; |
|
21 | 21 | |
22 | - /** |
|
23 | - * ProvisioningApiMiddleware constructor. |
|
24 | - * |
|
25 | - * @param IControllerMethodReflector $reflector |
|
26 | - * @param bool $isAdmin |
|
27 | - * @param bool $isSubAdmin |
|
28 | - */ |
|
29 | - public function __construct( |
|
30 | - IControllerMethodReflector $reflector, |
|
31 | - $isAdmin, |
|
32 | - $isSubAdmin) { |
|
33 | - $this->reflector = $reflector; |
|
34 | - $this->isAdmin = $isAdmin; |
|
35 | - $this->isSubAdmin = $isSubAdmin; |
|
36 | - } |
|
22 | + /** |
|
23 | + * ProvisioningApiMiddleware constructor. |
|
24 | + * |
|
25 | + * @param IControllerMethodReflector $reflector |
|
26 | + * @param bool $isAdmin |
|
27 | + * @param bool $isSubAdmin |
|
28 | + */ |
|
29 | + public function __construct( |
|
30 | + IControllerMethodReflector $reflector, |
|
31 | + $isAdmin, |
|
32 | + $isSubAdmin) { |
|
33 | + $this->reflector = $reflector; |
|
34 | + $this->isAdmin = $isAdmin; |
|
35 | + $this->isSubAdmin = $isSubAdmin; |
|
36 | + } |
|
37 | 37 | |
38 | - /** |
|
39 | - * @param \OCP\AppFramework\Controller $controller |
|
40 | - * @param string $methodName |
|
41 | - * |
|
42 | - * @throws NotSubAdminException |
|
43 | - */ |
|
44 | - public function beforeController($controller, $methodName) { |
|
45 | - if (!$this->isAdmin && !$this->reflector->hasAnnotation('NoSubAdminRequired') && !$this->isSubAdmin) { |
|
46 | - throw new NotSubAdminException(); |
|
47 | - } |
|
48 | - } |
|
38 | + /** |
|
39 | + * @param \OCP\AppFramework\Controller $controller |
|
40 | + * @param string $methodName |
|
41 | + * |
|
42 | + * @throws NotSubAdminException |
|
43 | + */ |
|
44 | + public function beforeController($controller, $methodName) { |
|
45 | + if (!$this->isAdmin && !$this->reflector->hasAnnotation('NoSubAdminRequired') && !$this->isSubAdmin) { |
|
46 | + throw new NotSubAdminException(); |
|
47 | + } |
|
48 | + } |
|
49 | 49 | |
50 | - /** |
|
51 | - * @param \OCP\AppFramework\Controller $controller |
|
52 | - * @param string $methodName |
|
53 | - * @param \Exception $exception |
|
54 | - * @throws \Exception |
|
55 | - * @return Response |
|
56 | - */ |
|
57 | - public function afterException($controller, $methodName, \Exception $exception) { |
|
58 | - if ($exception instanceof NotSubAdminException) { |
|
59 | - throw new OCSException($exception->getMessage(), \OCP\API::RESPOND_UNAUTHORISED); |
|
60 | - } |
|
50 | + /** |
|
51 | + * @param \OCP\AppFramework\Controller $controller |
|
52 | + * @param string $methodName |
|
53 | + * @param \Exception $exception |
|
54 | + * @throws \Exception |
|
55 | + * @return Response |
|
56 | + */ |
|
57 | + public function afterException($controller, $methodName, \Exception $exception) { |
|
58 | + if ($exception instanceof NotSubAdminException) { |
|
59 | + throw new OCSException($exception->getMessage(), \OCP\API::RESPOND_UNAUTHORISED); |
|
60 | + } |
|
61 | 61 | |
62 | - throw $exception; |
|
63 | - } |
|
62 | + throw $exception; |
|
63 | + } |
|
64 | 64 | } |
65 | 65 | \ No newline at end of file |
@@ -1,17 +1,17 @@ |
||
1 | 1 | <?php |
2 | - script('updatenotification', 'admin'); |
|
2 | + script('updatenotification', 'admin'); |
|
3 | 3 | |
4 | - /** @var array $_ */ |
|
5 | - /** @var bool $isNewVersionAvailable */ |
|
6 | - $isNewVersionAvailable = $_['isNewVersionAvailable']; |
|
7 | - /** @var string $newVersionString */ |
|
8 | - $newVersionString = $_['newVersionString']; |
|
9 | - /** @var string $lastCheckedDate */ |
|
10 | - $lastCheckedDate = $_['lastChecked']; |
|
11 | - /** @var array $channels */ |
|
12 | - $channels = $_['channels']; |
|
13 | - /** @var string $currentChannel */ |
|
14 | - $currentChannel = $_['currentChannel']; |
|
4 | + /** @var array $_ */ |
|
5 | + /** @var bool $isNewVersionAvailable */ |
|
6 | + $isNewVersionAvailable = $_['isNewVersionAvailable']; |
|
7 | + /** @var string $newVersionString */ |
|
8 | + $newVersionString = $_['newVersionString']; |
|
9 | + /** @var string $lastCheckedDate */ |
|
10 | + $lastCheckedDate = $_['lastChecked']; |
|
11 | + /** @var array $channels */ |
|
12 | + $channels = $_['channels']; |
|
13 | + /** @var string $currentChannel */ |
|
14 | + $currentChannel = $_['currentChannel']; |
|
15 | 15 | ?> |
16 | 16 | <form id="oca_updatenotification_section" class="followupsection"> |
17 | 17 | <?php if($isNewVersionAvailable === true) { ?> |
@@ -14,7 +14,7 @@ discard block |
||
14 | 14 | $currentChannel = $_['currentChannel']; |
15 | 15 | ?> |
16 | 16 | <form id="oca_updatenotification_section" class="followupsection"> |
17 | - <?php if($isNewVersionAvailable === true) { ?> |
|
17 | + <?php if ($isNewVersionAvailable === true) { ?> |
|
18 | 18 | <strong><?php p($l->t('A new version is available: %s', [$newVersionString])); ?></strong> |
19 | 19 | <?php if ($_['updaterEnabled']) { ?> |
20 | 20 | <input type="button" id="oca_updatenotification_button" value="<?php p($l->t('Open updater')) ?>"> |
@@ -31,7 +31,7 @@ discard block |
||
31 | 31 | <label for="release-channel"><?php p($l->t('Update channel:')) ?></label> |
32 | 32 | <select id="release-channel"> |
33 | 33 | <option value="<?php p($currentChannel); ?>"><?php p($currentChannel); ?></option> |
34 | - <?php foreach ($channels as $channel => $channelTitle){ ?> |
|
34 | + <?php foreach ($channels as $channel => $channelTitle) { ?> |
|
35 | 35 | <option value="<?php p($channelTitle) ?>"> |
36 | 36 | <?php p($channelTitle) ?> |
37 | 37 | </option> |
@@ -48,11 +48,20 @@ |
||
48 | 48 | <br /> |
49 | 49 | <?php p($l->t('Notify members of the following groups about available updates:')); ?> |
50 | 50 | <input name="oca_updatenotification_groups_list" type="hidden" id="oca_updatenotification_groups_list" value="<?php p($_['notify_groups']) ?>" style="width: 400px"> |
51 | - <em class="<?php if (!in_array($currentChannel, ['daily', 'git'])) p('hidden'); ?>"> |
|
51 | + <em class="<?php if (!in_array($currentChannel, ['daily', 'git'])) { |
|
52 | + p('hidden'); |
|
53 | +} |
|
54 | +?>"> |
|
52 | 55 | <br /> |
53 | 56 | <?php p($l->t('Only notification for app updates are available.')); ?> |
54 | - <?php if ($currentChannel === 'daily') p($l->t('The selected update channel makes dedicated notifications for the server obsolete.')); ?> |
|
55 | - <?php if ($currentChannel === 'git') p($l->t('The selected update channel does not support updates of the server.')); ?> |
|
57 | + <?php if ($currentChannel === 'daily') { |
|
58 | + p($l->t('The selected update channel makes dedicated notifications for the server obsolete.')); |
|
59 | +} |
|
60 | +?> |
|
61 | + <?php if ($currentChannel === 'git') { |
|
62 | + p($l->t('The selected update channel does not support updates of the server.')); |
|
63 | +} |
|
64 | +?> |
|
56 | 65 | </em> |
57 | 66 | </p> |
58 | 67 | </form> |
@@ -37,139 +37,139 @@ |
||
37 | 37 | use OCP\Settings\ISettings; |
38 | 38 | |
39 | 39 | class AdminController extends Controller implements ISettings { |
40 | - /** @var IJobList */ |
|
41 | - private $jobList; |
|
42 | - /** @var ISecureRandom */ |
|
43 | - private $secureRandom; |
|
44 | - /** @var IConfig */ |
|
45 | - private $config; |
|
46 | - /** @var ITimeFactory */ |
|
47 | - private $timeFactory; |
|
48 | - /** @var UpdateChecker */ |
|
49 | - private $updateChecker; |
|
50 | - /** @var IL10N */ |
|
51 | - private $l10n; |
|
52 | - /** @var IDateTimeFormatter */ |
|
53 | - private $dateTimeFormatter; |
|
54 | - |
|
55 | - /** |
|
56 | - * @param string $appName |
|
57 | - * @param IRequest $request |
|
58 | - * @param IJobList $jobList |
|
59 | - * @param ISecureRandom $secureRandom |
|
60 | - * @param IConfig $config |
|
61 | - * @param ITimeFactory $timeFactory |
|
62 | - * @param IL10N $l10n |
|
63 | - * @param UpdateChecker $updateChecker |
|
64 | - * @param IDateTimeFormatter $dateTimeFormatter |
|
65 | - */ |
|
66 | - public function __construct($appName, |
|
67 | - IRequest $request, |
|
68 | - IJobList $jobList, |
|
69 | - ISecureRandom $secureRandom, |
|
70 | - IConfig $config, |
|
71 | - ITimeFactory $timeFactory, |
|
72 | - IL10N $l10n, |
|
73 | - UpdateChecker $updateChecker, |
|
74 | - IDateTimeFormatter $dateTimeFormatter) { |
|
75 | - parent::__construct($appName, $request); |
|
76 | - $this->jobList = $jobList; |
|
77 | - $this->secureRandom = $secureRandom; |
|
78 | - $this->config = $config; |
|
79 | - $this->timeFactory = $timeFactory; |
|
80 | - $this->l10n = $l10n; |
|
81 | - $this->updateChecker = $updateChecker; |
|
82 | - $this->dateTimeFormatter = $dateTimeFormatter; |
|
83 | - } |
|
84 | - |
|
85 | - /** |
|
86 | - * @return TemplateResponse |
|
87 | - */ |
|
88 | - public function displayPanel() { |
|
89 | - $lastUpdateCheck = $this->dateTimeFormatter->formatDateTime( |
|
90 | - $this->config->getAppValue('core', 'lastupdatedat') |
|
91 | - ); |
|
92 | - |
|
93 | - $channels = [ |
|
94 | - 'daily', |
|
95 | - 'beta', |
|
96 | - 'stable', |
|
97 | - 'production', |
|
98 | - ]; |
|
99 | - $currentChannel = \OCP\Util::getChannel(); |
|
100 | - |
|
101 | - // Remove the currently used channel from the channels list |
|
102 | - if(($key = array_search($currentChannel, $channels)) !== false) { |
|
103 | - unset($channels[$key]); |
|
104 | - } |
|
105 | - $updateState = $this->updateChecker->getUpdateState(); |
|
106 | - |
|
107 | - $notifyGroups = json_decode($this->config->getAppValue('updatenotification', 'notify_groups', '["admin"]'), true); |
|
108 | - |
|
109 | - $params = [ |
|
110 | - 'isNewVersionAvailable' => !empty($updateState['updateAvailable']), |
|
111 | - 'lastChecked' => $lastUpdateCheck, |
|
112 | - 'currentChannel' => $currentChannel, |
|
113 | - 'channels' => $channels, |
|
114 | - 'newVersionString' => (empty($updateState['updateVersion'])) ? '' : $updateState['updateVersion'], |
|
115 | - 'downloadLink' => (empty($updateState['downloadLink'])) ? '' : $updateState['downloadLink'], |
|
116 | - 'updaterEnabled' => (empty($updateState['updaterEnabled'])) ? false : $updateState['updaterEnabled'], |
|
117 | - |
|
118 | - 'notify_groups' => implode('|', $notifyGroups), |
|
119 | - ]; |
|
120 | - |
|
121 | - return new TemplateResponse($this->appName, 'admin', $params, ''); |
|
122 | - } |
|
123 | - |
|
124 | - /** |
|
125 | - * @UseSession |
|
126 | - * |
|
127 | - * @param string $channel |
|
128 | - * @return DataResponse |
|
129 | - */ |
|
130 | - public function setChannel($channel) { |
|
131 | - \OCP\Util::setChannel($channel); |
|
132 | - $this->config->setAppValue('core', 'lastupdatedat', 0); |
|
133 | - return new DataResponse(['status' => 'success', 'data' => ['message' => $this->l10n->t('Channel updated')]]); |
|
134 | - } |
|
135 | - |
|
136 | - /** |
|
137 | - * @return DataResponse |
|
138 | - */ |
|
139 | - public function createCredentials() { |
|
140 | - // Create a new job and store the creation date |
|
141 | - $this->jobList->add('OCA\UpdateNotification\ResetTokenBackgroundJob'); |
|
142 | - $this->config->setAppValue('core', 'updater.secret.created', $this->timeFactory->getTime()); |
|
143 | - |
|
144 | - // Create a new token |
|
145 | - $newToken = $this->secureRandom->generate(64); |
|
146 | - $this->config->setSystemValue('updater.secret', password_hash($newToken, PASSWORD_DEFAULT)); |
|
147 | - |
|
148 | - return new DataResponse($newToken); |
|
149 | - } |
|
150 | - |
|
151 | - /** |
|
152 | - * @return TemplateResponse returns the instance with all parameters set, ready to be rendered |
|
153 | - */ |
|
154 | - public function getForm() { |
|
155 | - return $this->displayPanel(); |
|
156 | - } |
|
157 | - |
|
158 | - /** |
|
159 | - * @return string the section ID, e.g. 'sharing' |
|
160 | - */ |
|
161 | - public function getSection() { |
|
162 | - return 'server'; |
|
163 | - } |
|
164 | - |
|
165 | - /** |
|
166 | - * @return int whether the form should be rather on the top or bottom of |
|
167 | - * the admin section. The forms are arranged in ascending order of the |
|
168 | - * priority values. It is required to return a value between 0 and 100. |
|
169 | - * |
|
170 | - * E.g.: 70 |
|
171 | - */ |
|
172 | - public function getPriority() { |
|
173 | - return 1; |
|
174 | - } |
|
40 | + /** @var IJobList */ |
|
41 | + private $jobList; |
|
42 | + /** @var ISecureRandom */ |
|
43 | + private $secureRandom; |
|
44 | + /** @var IConfig */ |
|
45 | + private $config; |
|
46 | + /** @var ITimeFactory */ |
|
47 | + private $timeFactory; |
|
48 | + /** @var UpdateChecker */ |
|
49 | + private $updateChecker; |
|
50 | + /** @var IL10N */ |
|
51 | + private $l10n; |
|
52 | + /** @var IDateTimeFormatter */ |
|
53 | + private $dateTimeFormatter; |
|
54 | + |
|
55 | + /** |
|
56 | + * @param string $appName |
|
57 | + * @param IRequest $request |
|
58 | + * @param IJobList $jobList |
|
59 | + * @param ISecureRandom $secureRandom |
|
60 | + * @param IConfig $config |
|
61 | + * @param ITimeFactory $timeFactory |
|
62 | + * @param IL10N $l10n |
|
63 | + * @param UpdateChecker $updateChecker |
|
64 | + * @param IDateTimeFormatter $dateTimeFormatter |
|
65 | + */ |
|
66 | + public function __construct($appName, |
|
67 | + IRequest $request, |
|
68 | + IJobList $jobList, |
|
69 | + ISecureRandom $secureRandom, |
|
70 | + IConfig $config, |
|
71 | + ITimeFactory $timeFactory, |
|
72 | + IL10N $l10n, |
|
73 | + UpdateChecker $updateChecker, |
|
74 | + IDateTimeFormatter $dateTimeFormatter) { |
|
75 | + parent::__construct($appName, $request); |
|
76 | + $this->jobList = $jobList; |
|
77 | + $this->secureRandom = $secureRandom; |
|
78 | + $this->config = $config; |
|
79 | + $this->timeFactory = $timeFactory; |
|
80 | + $this->l10n = $l10n; |
|
81 | + $this->updateChecker = $updateChecker; |
|
82 | + $this->dateTimeFormatter = $dateTimeFormatter; |
|
83 | + } |
|
84 | + |
|
85 | + /** |
|
86 | + * @return TemplateResponse |
|
87 | + */ |
|
88 | + public function displayPanel() { |
|
89 | + $lastUpdateCheck = $this->dateTimeFormatter->formatDateTime( |
|
90 | + $this->config->getAppValue('core', 'lastupdatedat') |
|
91 | + ); |
|
92 | + |
|
93 | + $channels = [ |
|
94 | + 'daily', |
|
95 | + 'beta', |
|
96 | + 'stable', |
|
97 | + 'production', |
|
98 | + ]; |
|
99 | + $currentChannel = \OCP\Util::getChannel(); |
|
100 | + |
|
101 | + // Remove the currently used channel from the channels list |
|
102 | + if(($key = array_search($currentChannel, $channels)) !== false) { |
|
103 | + unset($channels[$key]); |
|
104 | + } |
|
105 | + $updateState = $this->updateChecker->getUpdateState(); |
|
106 | + |
|
107 | + $notifyGroups = json_decode($this->config->getAppValue('updatenotification', 'notify_groups', '["admin"]'), true); |
|
108 | + |
|
109 | + $params = [ |
|
110 | + 'isNewVersionAvailable' => !empty($updateState['updateAvailable']), |
|
111 | + 'lastChecked' => $lastUpdateCheck, |
|
112 | + 'currentChannel' => $currentChannel, |
|
113 | + 'channels' => $channels, |
|
114 | + 'newVersionString' => (empty($updateState['updateVersion'])) ? '' : $updateState['updateVersion'], |
|
115 | + 'downloadLink' => (empty($updateState['downloadLink'])) ? '' : $updateState['downloadLink'], |
|
116 | + 'updaterEnabled' => (empty($updateState['updaterEnabled'])) ? false : $updateState['updaterEnabled'], |
|
117 | + |
|
118 | + 'notify_groups' => implode('|', $notifyGroups), |
|
119 | + ]; |
|
120 | + |
|
121 | + return new TemplateResponse($this->appName, 'admin', $params, ''); |
|
122 | + } |
|
123 | + |
|
124 | + /** |
|
125 | + * @UseSession |
|
126 | + * |
|
127 | + * @param string $channel |
|
128 | + * @return DataResponse |
|
129 | + */ |
|
130 | + public function setChannel($channel) { |
|
131 | + \OCP\Util::setChannel($channel); |
|
132 | + $this->config->setAppValue('core', 'lastupdatedat', 0); |
|
133 | + return new DataResponse(['status' => 'success', 'data' => ['message' => $this->l10n->t('Channel updated')]]); |
|
134 | + } |
|
135 | + |
|
136 | + /** |
|
137 | + * @return DataResponse |
|
138 | + */ |
|
139 | + public function createCredentials() { |
|
140 | + // Create a new job and store the creation date |
|
141 | + $this->jobList->add('OCA\UpdateNotification\ResetTokenBackgroundJob'); |
|
142 | + $this->config->setAppValue('core', 'updater.secret.created', $this->timeFactory->getTime()); |
|
143 | + |
|
144 | + // Create a new token |
|
145 | + $newToken = $this->secureRandom->generate(64); |
|
146 | + $this->config->setSystemValue('updater.secret', password_hash($newToken, PASSWORD_DEFAULT)); |
|
147 | + |
|
148 | + return new DataResponse($newToken); |
|
149 | + } |
|
150 | + |
|
151 | + /** |
|
152 | + * @return TemplateResponse returns the instance with all parameters set, ready to be rendered |
|
153 | + */ |
|
154 | + public function getForm() { |
|
155 | + return $this->displayPanel(); |
|
156 | + } |
|
157 | + |
|
158 | + /** |
|
159 | + * @return string the section ID, e.g. 'sharing' |
|
160 | + */ |
|
161 | + public function getSection() { |
|
162 | + return 'server'; |
|
163 | + } |
|
164 | + |
|
165 | + /** |
|
166 | + * @return int whether the form should be rather on the top or bottom of |
|
167 | + * the admin section. The forms are arranged in ascending order of the |
|
168 | + * priority values. It is required to return a value between 0 and 100. |
|
169 | + * |
|
170 | + * E.g.: 70 |
|
171 | + */ |
|
172 | + public function getPriority() { |
|
173 | + return 1; |
|
174 | + } |
|
175 | 175 | } |
@@ -99,7 +99,7 @@ |
||
99 | 99 | $currentChannel = \OCP\Util::getChannel(); |
100 | 100 | |
101 | 101 | // Remove the currently used channel from the channels list |
102 | - if(($key = array_search($currentChannel, $channels)) !== false) { |
|
102 | + if (($key = array_search($currentChannel, $channels)) !== false) { |
|
103 | 103 | unset($channels[$key]); |
104 | 104 | } |
105 | 105 | $updateState = $this->updateChecker->getUpdateState(); |
@@ -26,48 +26,48 @@ |
||
26 | 26 | use OC\Updater\VersionCheck; |
27 | 27 | |
28 | 28 | class UpdateChecker { |
29 | - /** @var VersionCheck */ |
|
30 | - private $updater; |
|
29 | + /** @var VersionCheck */ |
|
30 | + private $updater; |
|
31 | 31 | |
32 | - /** |
|
33 | - * @param VersionCheck $updater |
|
34 | - */ |
|
35 | - public function __construct(VersionCheck $updater) { |
|
36 | - $this->updater = $updater; |
|
37 | - } |
|
32 | + /** |
|
33 | + * @param VersionCheck $updater |
|
34 | + */ |
|
35 | + public function __construct(VersionCheck $updater) { |
|
36 | + $this->updater = $updater; |
|
37 | + } |
|
38 | 38 | |
39 | - /** |
|
40 | - * @return array |
|
41 | - */ |
|
42 | - public function getUpdateState() { |
|
43 | - $data = $this->updater->check(); |
|
44 | - $result = []; |
|
39 | + /** |
|
40 | + * @return array |
|
41 | + */ |
|
42 | + public function getUpdateState() { |
|
43 | + $data = $this->updater->check(); |
|
44 | + $result = []; |
|
45 | 45 | |
46 | - if(isset($data['version']) && $data['version'] !== '' && $data['version'] !== []) { |
|
47 | - $result['updateAvailable'] = true; |
|
48 | - $result['updateVersion'] = $data['versionstring']; |
|
49 | - $result['updaterEnabled'] = $data['autoupdater'] === '1'; |
|
50 | - if(substr($data['web'], 0, 8) === 'https://') { |
|
51 | - $result['updateLink'] = $data['web']; |
|
52 | - } |
|
53 | - if(substr($data['url'], 0, 8) === 'https://') { |
|
54 | - $result['downloadLink'] = $data['url']; |
|
55 | - } |
|
46 | + if(isset($data['version']) && $data['version'] !== '' && $data['version'] !== []) { |
|
47 | + $result['updateAvailable'] = true; |
|
48 | + $result['updateVersion'] = $data['versionstring']; |
|
49 | + $result['updaterEnabled'] = $data['autoupdater'] === '1'; |
|
50 | + if(substr($data['web'], 0, 8) === 'https://') { |
|
51 | + $result['updateLink'] = $data['web']; |
|
52 | + } |
|
53 | + if(substr($data['url'], 0, 8) === 'https://') { |
|
54 | + $result['downloadLink'] = $data['url']; |
|
55 | + } |
|
56 | 56 | |
57 | - return $result; |
|
58 | - } |
|
57 | + return $result; |
|
58 | + } |
|
59 | 59 | |
60 | - return []; |
|
61 | - } |
|
60 | + return []; |
|
61 | + } |
|
62 | 62 | |
63 | - /** |
|
64 | - * @param array $data |
|
65 | - */ |
|
66 | - public function getJavaScript(array $data) { |
|
67 | - $data['array']['oc_updateState'] = json_encode([ |
|
68 | - 'updateAvailable' => true, |
|
69 | - 'updateVersion' => $this->getUpdateState()['updateVersion'], |
|
70 | - 'updateLink' => isset($this->getUpdateState()['updateLink']) ? $this->getUpdateState()['updateLink'] : '', |
|
71 | - ]); |
|
72 | - } |
|
63 | + /** |
|
64 | + * @param array $data |
|
65 | + */ |
|
66 | + public function getJavaScript(array $data) { |
|
67 | + $data['array']['oc_updateState'] = json_encode([ |
|
68 | + 'updateAvailable' => true, |
|
69 | + 'updateVersion' => $this->getUpdateState()['updateVersion'], |
|
70 | + 'updateLink' => isset($this->getUpdateState()['updateLink']) ? $this->getUpdateState()['updateLink'] : '', |
|
71 | + ]); |
|
72 | + } |
|
73 | 73 | } |
@@ -43,14 +43,14 @@ discard block |
||
43 | 43 | $data = $this->updater->check(); |
44 | 44 | $result = []; |
45 | 45 | |
46 | - if(isset($data['version']) && $data['version'] !== '' && $data['version'] !== []) { |
|
46 | + if (isset($data['version']) && $data['version'] !== '' && $data['version'] !== []) { |
|
47 | 47 | $result['updateAvailable'] = true; |
48 | 48 | $result['updateVersion'] = $data['versionstring']; |
49 | 49 | $result['updaterEnabled'] = $data['autoupdater'] === '1'; |
50 | - if(substr($data['web'], 0, 8) === 'https://') { |
|
50 | + if (substr($data['web'], 0, 8) === 'https://') { |
|
51 | 51 | $result['updateLink'] = $data['web']; |
52 | 52 | } |
53 | - if(substr($data['url'], 0, 8) === 'https://') { |
|
53 | + if (substr($data['url'], 0, 8) === 'https://') { |
|
54 | 54 | $result['downloadLink'] = $data['url']; |
55 | 55 | } |
56 | 56 | |
@@ -64,7 +64,7 @@ discard block |
||
64 | 64 | * @param array $data |
65 | 65 | */ |
66 | 66 | public function getJavaScript(array $data) { |
67 | - $data['array']['oc_updateState'] = json_encode([ |
|
67 | + $data['array']['oc_updateState'] = json_encode([ |
|
68 | 68 | 'updateAvailable' => true, |
69 | 69 | 'updateVersion' => $this->getUpdateState()['updateVersion'], |
70 | 70 | 'updateLink' => isset($this->getUpdateState()['updateLink']) ? $this->getUpdateState()['updateLink'] : '', |
@@ -30,27 +30,27 @@ |
||
30 | 30 | use OCP\AppFramework\IAppContainer; |
31 | 31 | |
32 | 32 | class Application extends App { |
33 | - public function __construct (array $urlParams = array()) { |
|
34 | - parent::__construct('updatenotification', $urlParams); |
|
35 | - $container = $this->getContainer(); |
|
33 | + public function __construct (array $urlParams = array()) { |
|
34 | + parent::__construct('updatenotification', $urlParams); |
|
35 | + $container = $this->getContainer(); |
|
36 | 36 | |
37 | - $container->registerService('AdminController', function(IAppContainer $c) { |
|
38 | - $updater = new \OC\Updater\VersionCheck( |
|
39 | - \OC::$server->getHTTPClientService(), |
|
40 | - \OC::$server->getConfig() |
|
41 | - ); |
|
42 | - return new AdminController( |
|
43 | - $c->query('AppName'), |
|
44 | - $c->query('Request'), |
|
45 | - $c->getServer()->getJobList(), |
|
46 | - $c->getServer()->getSecureRandom(), |
|
47 | - $c->getServer()->getConfig(), |
|
48 | - new TimeFactory(), |
|
49 | - $c->getServer()->getL10N($c->query('AppName')), |
|
50 | - new UpdateChecker($updater), |
|
51 | - $c->getServer()->getDateTimeFormatter() |
|
52 | - ); |
|
53 | - }); |
|
54 | - } |
|
37 | + $container->registerService('AdminController', function(IAppContainer $c) { |
|
38 | + $updater = new \OC\Updater\VersionCheck( |
|
39 | + \OC::$server->getHTTPClientService(), |
|
40 | + \OC::$server->getConfig() |
|
41 | + ); |
|
42 | + return new AdminController( |
|
43 | + $c->query('AppName'), |
|
44 | + $c->query('Request'), |
|
45 | + $c->getServer()->getJobList(), |
|
46 | + $c->getServer()->getSecureRandom(), |
|
47 | + $c->getServer()->getConfig(), |
|
48 | + new TimeFactory(), |
|
49 | + $c->getServer()->getL10N($c->query('AppName')), |
|
50 | + new UpdateChecker($updater), |
|
51 | + $c->getServer()->getDateTimeFormatter() |
|
52 | + ); |
|
53 | + }); |
|
54 | + } |
|
55 | 55 | |
56 | 56 | } |
@@ -30,7 +30,7 @@ |
||
30 | 30 | use OCP\AppFramework\IAppContainer; |
31 | 31 | |
32 | 32 | class Application extends App { |
33 | - public function __construct (array $urlParams = array()) { |
|
33 | + public function __construct(array $urlParams = array()) { |
|
34 | 34 | parent::__construct('updatenotification', $urlParams); |
35 | 35 | $container = $this->getContainer(); |
36 | 36 |
@@ -34,44 +34,44 @@ |
||
34 | 34 | * @package OCA\UpdateNotification |
35 | 35 | */ |
36 | 36 | class ResetTokenBackgroundJob extends TimedJob { |
37 | - /** @var IConfig */ |
|
38 | - private $config; |
|
39 | - /** @var ITimeFactory */ |
|
40 | - private $timeFactory; |
|
37 | + /** @var IConfig */ |
|
38 | + private $config; |
|
39 | + /** @var ITimeFactory */ |
|
40 | + private $timeFactory; |
|
41 | 41 | |
42 | - /** |
|
43 | - * @param IConfig|null $config |
|
44 | - * @param ITimeFactory|null $timeFactory |
|
45 | - */ |
|
46 | - public function __construct(IConfig $config = null, |
|
47 | - ITimeFactory $timeFactory = null) { |
|
48 | - // Run all 10 minutes |
|
49 | - $this->setInterval(60 * 10); |
|
42 | + /** |
|
43 | + * @param IConfig|null $config |
|
44 | + * @param ITimeFactory|null $timeFactory |
|
45 | + */ |
|
46 | + public function __construct(IConfig $config = null, |
|
47 | + ITimeFactory $timeFactory = null) { |
|
48 | + // Run all 10 minutes |
|
49 | + $this->setInterval(60 * 10); |
|
50 | 50 | |
51 | - if ($config instanceof IConfig && $timeFactory instanceof ITimeFactory) { |
|
52 | - $this->config = $config; |
|
53 | - $this->timeFactory = $timeFactory; |
|
54 | - } else { |
|
55 | - $this->fixDIForJobs(); |
|
56 | - } |
|
57 | - } |
|
51 | + if ($config instanceof IConfig && $timeFactory instanceof ITimeFactory) { |
|
52 | + $this->config = $config; |
|
53 | + $this->timeFactory = $timeFactory; |
|
54 | + } else { |
|
55 | + $this->fixDIForJobs(); |
|
56 | + } |
|
57 | + } |
|
58 | 58 | |
59 | - /** |
|
60 | - * DI for jobs |
|
61 | - */ |
|
62 | - private function fixDIForJobs() { |
|
63 | - $this->config = \OC::$server->getConfig(); |
|
64 | - $this->timeFactory = new TimeFactory(); |
|
65 | - } |
|
59 | + /** |
|
60 | + * DI for jobs |
|
61 | + */ |
|
62 | + private function fixDIForJobs() { |
|
63 | + $this->config = \OC::$server->getConfig(); |
|
64 | + $this->timeFactory = new TimeFactory(); |
|
65 | + } |
|
66 | 66 | |
67 | - /** |
|
68 | - * @param $argument |
|
69 | - */ |
|
70 | - protected function run($argument) { |
|
71 | - // Delete old tokens after 2 days |
|
72 | - if($this->timeFactory->getTime() - $this->config->getAppValue('core', 'updater.secret.created', $this->timeFactory->getTime()) >= 172800) { |
|
73 | - $this->config->deleteSystemValue('updater.secret'); |
|
74 | - } |
|
75 | - } |
|
67 | + /** |
|
68 | + * @param $argument |
|
69 | + */ |
|
70 | + protected function run($argument) { |
|
71 | + // Delete old tokens after 2 days |
|
72 | + if($this->timeFactory->getTime() - $this->config->getAppValue('core', 'updater.secret.created', $this->timeFactory->getTime()) >= 172800) { |
|
73 | + $this->config->deleteSystemValue('updater.secret'); |
|
74 | + } |
|
75 | + } |
|
76 | 76 | |
77 | 77 | } |
@@ -69,7 +69,7 @@ |
||
69 | 69 | */ |
70 | 70 | protected function run($argument) { |
71 | 71 | // Delete old tokens after 2 days |
72 | - if($this->timeFactory->getTime() - $this->config->getAppValue('core', 'updater.secret.created', $this->timeFactory->getTime()) >= 172800) { |
|
72 | + if ($this->timeFactory->getTime() - $this->config->getAppValue('core', 'updater.secret.created', $this->timeFactory->getTime()) >= 172800) { |
|
73 | 73 | $this->config->deleteSystemValue('updater.secret'); |
74 | 74 | } |
75 | 75 | } |
@@ -25,6 +25,6 @@ |
||
25 | 25 | |
26 | 26 | $application = new Application(); |
27 | 27 | $application->registerRoutes($this, ['routes' => [ |
28 | - ['name' => 'Admin#createCredentials', 'url' => '/credentials', 'verb' => 'GET'], |
|
29 | - ['name' => 'Admin#setChannel', 'url' => '/channel', 'verb' => 'POST'], |
|
28 | + ['name' => 'Admin#createCredentials', 'url' => '/credentials', 'verb' => 'GET'], |
|
29 | + ['name' => 'Admin#setChannel', 'url' => '/channel', 'verb' => 'POST'], |
|
30 | 30 | ]]); |