Get NC->NC working

.babelrc

@@ -0,0 +1,15 @@
+{
+  "presets": [
+    [
+      "@babel/preset-env",
+      {
+        "targets": {
+          "esmodules": true
+        }
+      }
+    ],
+    "@babel/preset-typescript"
+  ],
+  "plugins": [
+  ]
+}

.github/workflows/jest.yml → .github/workflows/ci.yml

@@ -25,7 +25,7 @@ jobs:
       # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
       - uses: actions/checkout@v2
 
-      - name: Run jest
+      - name: Run testsuite
         run: |
-          npm install
-          npm test
+          ./build.sh
+          ./ci.sh

.gitignore

@@ -1 +1,3 @@
 node_modules
+ocm-stub
+tls

Dockerfile

@@ -4,4 +4,8 @@ RUN apt-get install -y git vim
 ENV USER tester
 ENV PASSWORD 1234
 ENV VNC_PASSWORD 1234
-ADD ./ubuntu-init-script.sh /ubuntu-init-script.sh
+ADD ./ubuntu-init-script.sh /ubuntu-init-script.sh
+# Trust all the certificates:
+ADD tls /tls
+RUN cp /tls/*.crt /usr/local/share/ca-certificates/
+RUN update-ca-certificates

README.md

@@ -10,48 +10,12 @@ docker ps
 
 git clone https://github.com/cs3org/ocm-test-suite
 cd ocm-test-suite
-git checkout add-reva
-
-git clone https://github.com/michielbdejong/ocm-stub
-cd ocm-stub
-git checkout adapt-to-revad
-cd ..
-git clone https://github.com/michielbdejong/reva
-cd reva
-git checkout pass-ocm-test-suite
-cd ..
-
-./build.sh
-docker network create testnet
-docker run -d --network=testnet --rm --name=nc1.docker nextcloud
-docker run -d --network=testnet --rm --name=nc2.docker nextcloud
-docker run -d --network=testnet --rm --name=stub1.docker stub
-docker run -d --network=testnet --rm --name=stub2.docker stub
-docker run -d --network=testnet --rm --name=revad1.docker revad
-docker run -d --network=testnet --rm --name=revad2.docker revad
-docker run -p 6080:80 -p 5900:5900 -v /dev/shm:/dev/shm --network=testnet --name=tester -d --cap-add=SYS_ADMIN tester
+git checkout dev
 
-TESTER_IP_ADDR=`docker inspect -f '{{range.NetworkSettings.Networks}}{{.IPAddress}}{{end}}' tester`
-echo $TESTER_IP_ADDR
-# set up port forwarding from host to testnet for vnc:
-sysctl net.ipv4.ip_forward=1
-iptables -t nat -A PREROUTING -p tcp --dport 5900 -j DNAT --to-destination $TESTER_IP_ADDR:5900
+/bin/bash ./build.sh
+/bin/bash ./run.sh
 ```
 
-While still on the host system, run maintenance:install and set trusted domains in the Nextcloud servers:
-```sh
-docker exec -it --user=www-data nc1.docker /bin/bash
-```
-And then:
-```sh
-export PHP_MEMORY_LIMIT="512M"
-php console.php maintenance:install --admin-user alice --admin-pass alice123
-php console.php status
-vim config/config.php +24 # add nc1.docker as a trusted domain
-exit
-```
-And same for `nc2.docker`.
-
 Then from your laptop connect using VNC (e.g. open `vnc://dockerhost` in Safari), password 1234, you should see an Ubuntu desktop.
 You can test that you made it into the testnet by opening Start->Internet->Firefox Web Browser and browsing to https://nc1.docker, once you
 click 'accept the risk and continue', you should be able to log in to Nextcloud with 'alice'/'alice123'.
@@ -64,20 +28,6 @@ You can uncomment these in `./params-docker.js`.
 What does not work yet is OCM between Nextcloud/ownCloud  and Reva. We are currently discussing how to move forward
 from this situation. Please join https://gitter.im/cs3org/OCM and ping @michielbdejong if you want more up-to-date info and guidance.
 
-Here are some known issues we're working on:
-
-1. Only NC->NC public-link (login after) is currently being tested, the rest is commented out
-2. Reva has been added but is not passing the tests yet, due to a few open issues:
-  * https://github.com/cs3org/reva/issues/1752
-  * https://github.com/cs3org/reva/issues/1753
-  * https://github.com/cs3org/reva/issues/1962
-  * https://github.com/cs3org/reva/issues/1981
-3. Due to https://github.com/cs3org/ocm-test-suite/issues/34:
-   * add `'allow_local_remote_servers' => true` to /var/www/html/config/config.php on nc1.docker.
-   * add `'verify' => false` to /var/www/html/lib/private/Http/Client/ClientService.php line 75 on nc1.docker.
-   * comment out line 79 of /var/www/html/lib/private/Http/Client/Client.php
-   * even then it doesn't seem to work consistently yet.
-
 Now to run the tests, open a terminal (Start->System Tools->LXTerminal) and type (sudo password for user 'tester' is '1234'):
 ```sh
 /bin/bash /ubuntu-init-script.sh
@@ -87,7 +37,6 @@ git checkout dev
 npm run debug
 ```
 
-
 It tests three flows:
 
 ### Public-link flow (login first)

build.sh

@@ -1,22 +1,53 @@
 #!/bin/bash
+mkdir -p tls
+function createCert {
+  openssl req -new -x509 -days 365 -nodes \
+    -out ./tls/$1.crt \
+    -keyout ./tls/$1.key \
+    -subj "/C=RO/ST=Bucharest/L=Bucharest/O=IT/CN=$1" \
+    -addext "subjectAltName = DNS:localhost" \
+    -addext "subjectAltName = DNS:$1.docker"
+}
+
+createCert nc1
+createCert nc2
+createCert oc1
+createCert oc2
+createCert stub1
+createCert stub2
+createCert revad1
+createCert revad2
+
 docker build -t tester .
 
-# git clone https://github.com/michielbdejong/ocm-stub
+git clone https://github.com/michielbdejong/ocm-stub
 cd ocm-stub
+cp -r ../tls .
 docker build -t stub .
 cd ..
-# rm -rf ocm-stub
 
-# git clone https://github.com/michielbdejong/reva
-cd reva
-# git checkout pass-ocm-test-suite
-docker build -t revadbase -f ./Dockerfile.revad .
-cd ..
-# rm -rf reva
-cd revad
+cd servers/revad
+cp -r ../../tls .
 docker build -t revad .
 
-cd ../servers/nextcloud-server
+cd ../apache-php
+cp -r ../../tls .
+docker build -t apache-php .
+
+cd ../nextcloud
 docker build -t nextcloud .
-# cd ../owncloud-server
-# docker-compose pull
+
+cd ../nc1
+docker build -t nc1 .
+
+cd ../nc2
+docker build -t nc2 .
+
+cd ../owncloud
+docker build -t owncloud .
+
+cd ../oc1
+docker build -t oc1 .
+
+cd ../oc2
+docker build -t oc2 .

ci.sh

@@ -0,0 +1,13 @@
+#!/bin/bash
+docker rm `docker ps -aq`
+docker network remove testnet
+docker network create testnet
+docker run -d --network=testnet --rm --name=oc1.docker oc1
+docker run -d --network=testnet --rm --name=oc2.docker oc2
+docker run -d --network=testnet --rm --name=nc1.docker nc1
+docker run -d --network=testnet --rm --name=nc2.docker nc2
+docker run -d --network=testnet --rm --name=stub1.docker -e HOST=stub1 stub
+docker run -d --network=testnet --rm --name=stub2.docker -e HOST=stub2 stub
+docker run -d --network=testnet --rm --name=revad1.docker -e HOST=revad1 revad
+docker run -d --network=testnet --rm --name=revad2.docker -e HOST=revad2 revad
+docker run --network=testnet --name=tester -d --cap-add=SYS_ADMIN ci

clients/client.ts

@@ -0,0 +1,21 @@
+export abstract class Client {
+  guiType: string;
+  host: string
+  username: string
+  password: string
+  constructor({ host, username, password }) {
+    this.host = host;
+    this.username = username;
+    this.password = password;
+  }
+  abstract init(headless: boolean): Promise<void>
+  abstract login(fromCurrentPage: boolean): Promise<void>
+  abstract createPublicLink(): Promise<string>
+  abstract generateInvite(): Promise<string>
+  abstract forwardInvite(senderIdpName: string, tokenStr: string): Promise<void>
+  abstract shareWith(shareWithUser: string, shareWithHost: string, shareWithDomain: string, shareFromDomain: string): Promise<void>
+  abstract acceptPublicLink(url: string, remoteGuiType: string): Promise<void>
+  abstract acceptShare() : Promise<void>
+  abstract deleteAcceptedShare() : Promise<void>
+  abstract exit () : Promise<void>
+}

clients/nextcloud.ts

@@ -0,0 +1,54 @@
+import puppeteer from "puppeteer";
+import { GUI_TYPE_NEXTCLOUD } from "../guiTypes";
+import { OwncloudClient } from './owncloud';
+
+export class NextcloudClient extends OwncloudClient {
+  FTU_CLOSE_BUTTON: string =  'button.action-item.action-item--single.header-close.icon-close.undefined';
+  notificationDoneSelector: string  = 'div.icon-notifications-dark';
+  contextMenuSelector: string = 'a.action-menu';
+  unshareSelector: string = 'li.action-delete-container';
+  loginButton:string = '#submit-form';
+  constructor({ host, username, password }) {
+    super({ host, username, password });
+    this.guiType = GUI_TYPE_NEXTCLOUD;
+  }
+
+  async createPublicLink() {
+    const filesUrl = `https://${this.host}/index.php/apps/files/?dir=/&openfile=15`; // select nextcloud.png file
+    await this.page.goto(filesUrl);
+
+    await this.page.waitForSelector('image.app-icon');
+    await this.go('a#sharing');
+    const CREATE_PUBLIC_LINK_BUTTON = 'button.new-share-link';
+    const elt = await this.page.$(CREATE_PUBLIC_LINK_BUTTON);
+    if (elt) {
+      await this.page.click(CREATE_PUBLIC_LINK_BUTTON);
+    }
+    // await this.go('button.action-item__menutoggle');
+    // await this.go('li.new-share-link');
+
+    await this.page.waitForSelector('a.sharing-entry__copy');
+    return this.page.evaluate("document.querySelector('a.sharing-entry__copy').getAttribute('href')");
+  }
+  async shareWith(shareWithUser, shareWithHost) {
+    const filesUrl = `https://${this.host}/index.php/apps/files`;
+    await this.page.goto(filesUrl);
+    await this.checkFTU();
+    // FIXME deal with first-time-use splash screen for Nextcloud Hub
+    await this.page.waitForSelector('image.app-icon');
+    await this.go('a.action-share');
+    // Careful that it types into the top multiselect input and not the bottom one:
+    // FIXME: Find a nicer way to do this:
+    await new Promise((resolve) => setTimeout(resolve, 1000));
+
+    await this.type('div.multiselect__tags input.multiselect__input', `${shareWithUser}@${shareWithHost}`);
+    await this.go('span.option__desc--lineone');
+  }
+  async acceptPublicLink(url, remoteGuiType) {
+    await this.page.goto(url);
+    await this.go('button.menutoggle');
+    await this.go('button#save-external-share');
+    await this.page.type('#remote_address', `${this.username}@${this.host}`);
+    await this.page.click('#save-button-confirm');
+  }
+}