X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Ftools%2Fpeertube-auth.ts;h=c853469c27f286f52a8cf9cde9562c1491904761;hb=7815dc450ea9f8fd63e2234b6215013a132e6229;hp=8bc3d332c9cb43f24759328fb52be2be87b6f6f7;hpb=2b4dd7e26d93c2d9bef4f365cb03c511eff4ca8f;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/server/tools/peertube-auth.ts b/server/tools/peertube-auth.ts
index 8bc3d332c..c853469c2 100644
--- a/server/tools/peertube-auth.ts
+++ b/server/tools/peertube-auth.ts
@@ -1,15 +1,18 @@
-import * as program from 'commander'
-import * as prompt from 'prompt'
-import { getSettings, writeSettings, getNetrc } from './cli'
-import { isHostValid } from '../helpers/custom-validators/servers'
+import CliTable3 from 'cli-table3'
+import { OptionValues, program } from 'commander'
 import { isUserUsernameValid } from '../helpers/custom-validators/users'
+import { assignToken, buildServer, getNetrc, getSettings, writeSettings } from './shared'
 
-const Table = require('cli-table')
+import prompt = require('prompt')
 
 async function delInstance (url: string) {
   const [ settings, netrc ] = await Promise.all([ getSettings(), getNetrc() ])
 
-  settings.remotes.splice(settings.remotes.indexOf(url))
+  const index = settings.remotes.indexOf(url)
+  settings.remotes.splice(index)
+
+  if (settings.default === index) settings.default = -1
+
   await writeSettings(settings)
 
   delete netrc.machines[url]
@@ -17,12 +20,17 @@ async function delInstance (url: string) {
   await netrc.save()
 }
 
-async function setInstance (url: string, username: string, password: string) {
+async function setInstance (url: string, username: string, password: string, isDefault: boolean) {
   const [ settings, netrc ] = await Promise.all([ getSettings(), getNetrc() ])
 
-  if (settings.remotes.indexOf(url) === -1) {
+  if (settings.remotes.includes(url) === false) {
     settings.remotes.push(url)
   }
+
+  if (isDefault || settings.remotes.length === 1) {
+    settings.default = settings.remotes.length - 1
+  }
+
   await writeSettings(settings)
 
   netrc.machines[url] = { login: username, password }
@@ -30,7 +38,16 @@ async function setInstance (url: string, username: string, password: string) {
 }
 
 function isURLaPeerTubeInstance (url: string) {
-  return isHostValid(url) || (url.includes('localhost'))
+  return url.startsWith('http://') || url.startsWith('https://')
+}
+
+function stripExtraneousFromPeerTubeUrl (url: string) {
+  // Get everything before the 3rd /.
+  const urlLength = url.includes('/', 8)
+    ? url.indexOf('/', 8)
+    : url.length
+
+  return url.substring(0, urlLength)
 }
 
 program
@@ -44,7 +61,8 @@ program
   .option('-U, --username <username>', 'Username')
   .option('-p, --password <token>', 'Password')
   .option('--default', 'add the entry as the new default')
-  .action(options => {
+  .action((options: OptionValues) => {
+    /* eslint-disable no-import-assign */
     prompt.override = options
     prompt.start()
     prompt.get({
@@ -52,6 +70,7 @@ program
         url: {
           description: 'instance url',
           conform: (value) => isURLaPeerTubeInstance(value),
+          message: 'It should be an URL (https://peertube.example.com)',
           required: true
         },
         username: {
@@ -66,7 +85,21 @@ program
         }
       }
     }, async (_, result) => {
-      await setInstance(result.url, result.username, result.password)
+
+      // Check credentials
+      try {
+        // Strip out everything after the domain:port.
+        // See https://github.com/Chocobozzz/PeerTube/issues/3520
+        result.url = stripExtraneousFromPeerTubeUrl(result.url)
+
+        const server = buildServer(result.url)
+        await assignToken(server, result.username, result.password)
+      } catch (err) {
+        console.error(err.message)
+        process.exit(-1)
+      }
+
+      await setInstance(result.url, result.username, result.password, options.default)
 
       process.exit(0)
     })
@@ -87,12 +120,14 @@ program
   .action(async () => {
     const [ settings, netrc ] = await Promise.all([ getSettings(), getNetrc() ])
 
-    const table = new Table({
-      head: ['instance', 'login'],
-      colWidths: [30, 30]
-    })
+    const table = new CliTable3({
+      head: [ 'instance', 'login' ],
+      colWidths: [ 30, 30 ]
+    }) as any
 
     settings.remotes.forEach(element => {
+      if (!netrc.machines[element]) return
+
       table.push([
         element,
         netrc.machines[element].login
@@ -109,7 +144,7 @@ program
   .description('set an existing entry as default')
   .action(async url => {
     const settings = await getSettings()
-    const instanceExists = settings.remotes.indexOf(url) !== -1
+    const instanceExists = settings.remotes.includes(url)
 
     if (instanceExists) {
       settings.default = settings.remotes.indexOf(url)
@@ -122,15 +157,12 @@ program
     }
   })
 
-program.on('--help', function () {
-  console.log('  Examples:')
-  console.log()
-  console.log('    $ peertube add -u peertube.cpy.re -U "PEERTUBE_USER" --password "PEERTUBE_PASSWORD"')
-  console.log('    $ peertube add -u peertube.cpy.re -U root')
-  console.log('    $ peertube list')
-  console.log('    $ peertube del peertube.cpy.re')
-  console.log()
-})
+program.addHelpText('after', '\n\n  Examples:\n\n' +
+  '    $ peertube auth add -u https://peertube.cpy.re -U "PEERTUBE_USER" --password "PEERTUBE_PASSWORD"\n' +
+  '    $ peertube auth add -u https://peertube.cpy.re -U root\n' +
+  '    $ peertube auth list\n' +
+  '    $ peertube auth del https://peertube.cpy.re\n'
+)
 
 if (!process.argv.slice(2).length) {
   program.outputHelp()