Refinements #32

MorrisJobke · 2016-09-21T22:54:52Z

show common HTTP phrases instead of cryptic status codes (404, 401, 503, ...)
add a lot of log output
add "requestID" to be able to track logs of a single request and log current version

MorrisJobke · 2016-09-21T23:00:35Z

How to test:

setup a local update server that serves an update URL
set following two options in config.php accordingly, like:
- 'updater.server.url' => 'http://192.168.0.25/updater_server/',
- 'updater.release.channel' => 'daily',
place the index.php of this PR into updater/index.php
go to admin page, scroll to the updater section and click the "Open updater" button

MorrisJobke · 2016-09-21T23:14:48Z

Also closing the browser should work fine. The only disadvantage then is that you need to generate a new secret and write it to the config.php, because that was done by the "Open updater" button logic and was newer shown to the user.

The updater then resumes at the step that was finished before.

MorrisJobke · 2016-09-21T23:28:29Z

The last commit addresses nextcloud/server#660 😉

LukasReschke · 2016-09-22T15:39:27Z

index.php

+
 		/** @var array $CONFIG */
-		$configFileName = __DIR__ . '/../config/config.php';
 		require $configFileName;


Add a check if the config file really exists, doesn't have to be the case with NEXTCLOUD_CONFIG_DIR.

LukasReschke · 2016-09-22T15:42:46Z

index.php

+			$charactersLength = strlen($characters);
+			$randomString = '';
+			for ($i = 0; $i < 10; $i++) {
+				$randomString .= $characters[rand(0, $charactersLength - 1)];


I don't want people complaining about that. Can we just use http://php.net/manual/en/function.random-int.php?

Also you might want to add $_SERVER['UNIQUE_ID'] which is used by http://httpd.apache.org/docs/current/mod/mod_unique_id.html

It's for making the log more readable.

LukasReschke · 2016-09-22T15:43:32Z

index.php

+					} else {
+						text = 'The following extra files have been found:<ul>';
+						response['response'].forEach(function(file) {
+							text += '<li>' + file + '</li>';


Also worth escaping.

LukasReschke · 2016-09-22T15:43:38Z

index.php

-					text += '</ul>';
+					var text = '';
+					if (typeof response['response'] === 'string') {
+						text = response['response'];


Let's escape that.

LukasReschke · 2016-09-22T15:43:55Z

index.php

+					} else {
+						text = 'The following places can not be written to:<ul>';
+						response['response'].forEach(function(file) {
+							text += '<li>' + file + '</li>';


Should be escaped.

LukasReschke · 2016-09-22T15:44:00Z

index.php

-					text += '</ul>';
+					var text = '';
+					if (typeof response['response'] === 'string') {
+						text = response['response'];


Should be escaped.

MorrisJobke · 2016-09-22T16:17:03Z

@LukasReschke I addressed your comments

LukasReschke · 2016-09-23T19:16:07Z

Thanks, @MorrisJobke :)

MorrisJobke · 2016-09-26T06:41:34Z

Together with nextcloud/server#1499 (and it's backports) this is what we need for our updater to work flawlessly - cc @nickvergessen @LukasReschke

nickvergessen · 2016-09-26T09:47:31Z

Tested:

Have additional files in place
Start update
See error that additional files exist
Delete files
Restart the update with the "Start update" button

Expected: List of additional files should be empty

Same "error" happens with "check write permissions".
The list should be cleared on a rerun

nickvergessen · 2016-09-26T09:49:28Z

Other then that it worked fine.

nickvergessen · 2016-09-26T09:49:41Z

👍

MorrisJobke · 2016-09-26T09:55:22Z

Restart the update with the "Start update" button

Good point. This should usually not be possible or otherwise better clear the current state of the UI.

MorrisJobke · 2016-09-26T14:26:52Z

Same "error" happens with "check write permissions".
The list should be cleared on a rerun

Fixed.

Restart the update with the "Start update" button

I fixed this properly. There is now a "Retry" button, that removes the warning of the last step and reruns it. The buttons are only shown, when they are actually needed.

MorrisJobke · 2016-09-26T14:28:11Z

@LukasReschke @nickvergessen Could you have a look at the latest changes? thanks

MorrisJobke · 2016-09-26T14:32:44Z

I just tested it with an 9.0.53 and this updater on IE11 and it works there fine too.

MorrisJobke · 2016-09-26T20:39:09Z

🎉

LukasReschke · 2016-09-26T20:46:35Z

RCs with the updater are built and available at:

=> https://download.nextcloud.com/server/prereleases/nextcloud-10.0.1RC2.tar.bz2
=> https://download.nextcloud.com/server/prereleases/nextcloud-9.0.54RC2.tar.bz2

blizzz · 2016-09-26T22:34:42Z

Upgraded my instance to the 10.0.1RC2, worked fine.

MorrisJobke added 3 commits September 21, 2016 21:34

add proper error text instead of cryptic HTTP error codes

b026785

Add more extensive logging

584ab32

log a request ID and the current version

bf28fd5

MorrisJobke added this to the Nextcloud 10.0.1 milestone Sep 21, 2016

MorrisJobke added enhancement 3. to review labels Sep 21, 2016

use the NEXTCLOUD_CONFIG_DIR if available to determine config dir

d960eb4

LukasReschke reviewed Sep 22, 2016

View reviewed changes

escape all responses from server

3411a98

check if the data directory is actually set

4778649

MorrisJobke added 2 commits September 26, 2016 16:24

show release channel in updater

4c725ad

allow to retry updater step directly from the updater

46e2b15

MorrisJobke mentioned this pull request Sep 26, 2016

Improve information about backups and pitfalls before doing an update #33

Closed

LukasReschke merged commit 4aa04d6 into add-simplified-updater Sep 26, 2016

LukasReschke deleted the refinements branch September 26, 2016 20:23

Refinements #32

Refinements #32

Uh oh!

Conversation

MorrisJobke commented Sep 21, 2016

Uh oh!

MorrisJobke commented Sep 21, 2016 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

MorrisJobke commented Sep 21, 2016 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

MorrisJobke commented Sep 21, 2016

Uh oh!

LukasReschke Sep 22, 2016

Choose a reason for hiding this comment

Uh oh!

LukasReschke Sep 22, 2016

Choose a reason for hiding this comment

Uh oh!

MorrisJobke Sep 22, 2016

Choose a reason for hiding this comment

Uh oh!

LukasReschke Sep 22, 2016 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

LukasReschke Sep 22, 2016 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

LukasReschke Sep 22, 2016

Choose a reason for hiding this comment

Uh oh!

LukasReschke Sep 22, 2016

Choose a reason for hiding this comment

Uh oh!

MorrisJobke commented Sep 22, 2016

Uh oh!

LukasReschke commented Sep 23, 2016

Uh oh!

MorrisJobke commented Sep 26, 2016

Uh oh!

nickvergessen commented Sep 26, 2016

Uh oh!

nickvergessen commented Sep 26, 2016

Uh oh!

nickvergessen commented Sep 26, 2016

Uh oh!

MorrisJobke commented Sep 26, 2016

Uh oh!

MorrisJobke commented Sep 26, 2016

Uh oh!

MorrisJobke commented Sep 26, 2016

Uh oh!

MorrisJobke commented Sep 26, 2016

Uh oh!

MorrisJobke commented Sep 26, 2016

Uh oh!

LukasReschke commented Sep 26, 2016

Uh oh!

blizzz commented Sep 26, 2016

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

MorrisJobke commented Sep 21, 2016 •

edited

Loading

MorrisJobke commented Sep 21, 2016 •

edited

Loading

LukasReschke Sep 22, 2016 •

edited

Loading

LukasReschke Sep 22, 2016 •

edited

Loading