feat(xo-server): multi processes

@xen-orchestra/log/.babelrc.js

@@ -0,0 +1,3 @@
+module.exports = require('../../@xen-orchestra/babel-config')(
+  require('./package.json')
+)

@xen-orchestra/log/.npmignore

@@ -0,0 +1,24 @@
+/benchmark/
+/benchmarks/
+*.bench.js
+*.bench.js.map
+
+/examples/
+example.js
+example.js.map
+*.example.js
+*.example.js.map
+
+/fixture/
+/fixtures/
+*.fixture.js
+*.fixture.js.map
+*.fixtures.js
+*.fixtures.js.map
+
+/test/
+/tests/
+*.spec.js
+*.spec.js.map
+
+__snapshots__/

@xen-orchestra/log/README.md

@@ -0,0 +1,149 @@
+# @xen-orchestra/log [![Build Status](https://travis-ci.org/vatesfr/xen-orchestra.png?branch=master)](https://travis-ci.org/vatesfr/xen-orchestra)
+
+> ${pkg.description}
+
+## Install
+
+Installation of the [npm package](https://npmjs.org/package/@xen-orchestra/log):
+
+```
+> npm install --save @xen-orchestra/log
+```
+
+## Usage
+
+Everywhere something should be logged:
+
+```js
+import { createLogger } from '@xen-orchestra/log'
+
+const log = createLogger('xo-server-api')
+log.warn('foo')
+```
+
+Then at application level you can choose how to handle these logs:
+
+```js
+import configure from '@xen-orchestra/log/configure'
+import createConsoleTransport from '@xen-orchestra/log/transports/console'
+import createEmailTransport from '@xen-orchestra/log/transports/email'
+
+configure([
+  {
+    // if filter is a string, then it is pattern
+    // (https://github.com/visionmedia/debug#wildcards) which is
+    // matched against the namespace of the logs
+    filter: process.env.DEBUG,
+
+    transport: createConsoleTransport()
+  },
+  {
+    // only levels >= warn
+    level: 'warn',
+
+    transport: createEmaileTransport({
+      service: 'gmail',
+      auth: {
+        user: 'jane.smith@gmail.com',
+        pass: 'H&NbECcpXF|pyXe#%ZEb'
+      },
+      from: 'jane.smith@gmail.com',
+      to: [
+        'jane.smith@gmail.com',
+        'sam.doe@yahoo.com'
+      ]
+    })
+  }
+])
+```
+
+### Transports
+
+#### Console
+
+```js
+import createConsoleTransport from '@xen-orchestra/log/transports/console'
+
+configure(createConsoleTransport())
+```
+
+#### Email
+
+Optional dependency:
+
+```
+> yarn add nodemailer pretty-format
+```
+
+Configuration:
+
+```js
+import createEmailTransport from '@xen-orchestra/log/transports/email'
+
+configure(createEmailTransport({
+  service: 'gmail',
+  auth: {
+    user: 'jane.smith@gmail.com',
+    pass: 'H&NbECcpXF|pyXe#%ZEb'
+  },
+  from: 'jane.smith@gmail.com',
+  to: [
+    'jane.smith@gmail.com',
+    'sam.doe@yahoo.com'
+  ]
+}))
+```
+
+#### Syslog
+
+Optional dependency:
+
+```
+> yarn add split-host syslog-client
+```
+
+Configuration:
+
+```js
+import createSyslogTransport from '@xen-orchestra/log/transports/syslog'
+
+// By default, log to udp://localhost:514
+configure(createSyslogTransport())
+
+// But TCP, a different host, or a different port can be used
+configure(createSyslogTransport('tcp://syslog.company.lan'))
+```
+
+## Development
+
+```
+# Install dependencies
+> yarn
+
+# Run the tests
+> yarn test
+
+# Continuously compile
+> yarn dev
+
+# Continuously run the tests
+> yarn dev-test
+
+# Build for production (automatically called by npm install)
+> yarn build
+```
+
+## Contributions
+
+Contributions are *very* welcomed, either on the documentation or on
+the code.
+
+You may:
+
+- report any [issue](https://github.com/vatesfr/xo-web/issues/)
+  you've encountered;
+- fork and create a pull request.
+
+## License
+
+ISC © [Vates SAS](https://vates.fr)

@xen-orchestra/log/configure.js

@@ -0,0 +1 @@
+module.exports = require('./dist/configure')

@xen-orchestra/log/package.json

@@ -0,0 +1,52 @@
+{
+  "private": true,
+  "name": "@xen-orchestra/log",
+  "version": "0.0.0",
+  "license": "ISC",
+  "description": "",
+  "keywords": [],
+  "homepage": "https://github.com/vatesfr/xen-orchestra/tree/master/packages/@xen-orchestra/log",
+  "bugs": "https://github.com/vatesfr/xen-orchestra/issues",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/vatesfr/xen-orchestra.git"
+  },
+  "author": {
+    "name": "Julien Fontanet",
+    "email": "julien.fontanet@vates.fr"
+  },
+  "preferGlobal": false,
+  "main": "dist/",
+  "bin": {},
+  "files": [
+    "dist/"
+  ],
+  "browserslist": [
+    ">2%"
+  ],
+  "engines": {
+    "node": ">=4"
+  },
+  "dependencies": {
+    "@babel/polyfill": "7.0.0-beta.42",
+    "lodash": "^4.17.4",
+    "promise-toolbox": "^0.9.5"
+  },
+  "devDependencies": {
+    "@babel/cli": "7.0.0-beta.42",
+    "@babel/core": "7.0.0-beta.42",
+    "@babel/preset-env": "7.0.0-beta.42",
+    "@babel/preset-flow": "7.0.0-beta.42",
+    "babel-plugin-lodash": "^3.3.2",
+    "cross-env": "^5.1.3",
+    "rimraf": "^2.6.2"
+  },
+  "scripts": {
+    "build": "cross-env NODE_ENV=production babel --source-maps --out-dir=dist/ src/",
+    "clean": "rimraf dist/",
+    "dev": "cross-env NODE_ENV=development babel --watch --source-maps --out-dir=dist/ src/",
+    "prebuild": "yarn run clean",
+    "predev": "yarn run prebuild",
+    "prepublishOnly": "yarn run build"
+  }
+}

@xen-orchestra/log/src/configure.js

@@ -0,0 +1,105 @@
+import createConsoleTransport from './transports/console'
+import LEVELS, { resolve } from './levels'
+import { compileGlobPattern } from './utils'
+
+// ===================================================================
+
+const createTransport = config => {
+  if (typeof config === 'function') {
+    return config
+  }
+
+  if (Array.isArray(config)) {
+    const transports = config.map(createTransport)
+    const { length } = transports
+    return function () {
+      for (let i = 0; i < length; ++i) {
+        transports[i].apply(this, arguments)
+      }
+    }
+  }
+
+  let { filter, transport } = config
+  const level = resolve(config.level)
+
+  if (filter !== undefined) {
+    if (typeof filter === 'string') {
+      const re = compileGlobPattern(filter)
+      filter = log => re.test(log.namespace)
+    }
+
+    const orig = transport
+    transport = function (log) {
+      if ((level !== undefined && log.level >= level) || filter(log)) {
+        return orig.apply(this, arguments)
+      }
+    }
+  } else if (level !== undefined) {
+    const orig = transport
+    transport = function (log) {
+      if (log.level >= level) {
+        return orig.apply(this, arguments)
+      }
+    }
+  }
+
+  return transport
+}
+
+let transport = createTransport({
+  // display warnings or above, and all that are enabled via DEBUG or
+  // NODE_DEBUG env
+  filter: process.env.DEBUG || process.env.NODE_DEBUG,
+  level: LEVELS.INFO,
+
+  transport: createConsoleTransport(),
+})
+
+const symbol =
+  typeof Symbol !== 'undefined'
+    ? Symbol.for('@xen-orchestra/log')
+    : '@@@xen-orchestra/log'
+global[symbol] = log => transport(log)
+
+export const configure = config => {
+  transport = createTransport(config)
+}
+
+// -------------------------------------------------------------------
+
+export const catchGlobalErrors = logger => {
+  // patch process
+  const onUncaughtException = error => {
+    logger.error('uncaught exception', { error })
+  }
+  const onUnhandledRejection = error => {
+    logger.warn('possibly unhandled rejection', { error })
+  }
+  const onWarning = error => {
+    logger.warn('Node warning', { error })
+  }
+  process.on('uncaughtException', onUncaughtException)
+  process.on('unhandledRejection', onUnhandledRejection)
+  process.on('warning', onWarning)
+
+  // patch EventEmitter
+  const EventEmitter = require('events')
+  const { prototype } = EventEmitter
+  const { emit } = prototype
+  function patchedEmit (event, error) {
+    event === 'error' && !this.listenerCount(event)
+      ? logger.error('unhandled error event', { error })
+      : emit.apply(this, arguments)
+  }
+  prototype.emit = patchedEmit
+
+  return () => {
+    process.removeListener('uncaughtException', onUncaughtException)
+    process.removeListener('unhandledRejection', onUnhandledRejection)
+    process.removeListener('warning', onWarning)
+
+    if (prototype.emit === patchedEmit) {
+      prototype.emit = emit
+    }
+  }
+}

@xen-orchestra/log/src/index.js

@@ -0,0 +1,65 @@
+import createTransport from './transports/console'
+import LEVELS from './levels'
+
+const symbol =
+  typeof Symbol !== 'undefined'
+    ? Symbol.for('@xen-orchestra/log')
+    : '@@@xen-orchestra/log'
+if (!(symbol in global)) {
+  // the default behavior, without requiring `configure` is to avoid
+  // logging anything unless it's a real error
+  const transport = createTransport()
+  global[symbol] = log => log.level > LEVELS.WARN && transport(log)
+}
+
+// -------------------------------------------------------------------
+
+function Log (data, level, namespace, message, time) {
+  this.data = data
+  this.level = level
+  this.namespace = namespace
+  this.message = message
+  this.time = time
+}
+
+function Logger (namespace) {
+  this._namespace = namespace
+
+  // bind all logging methods
+  for (const name in LEVELS) {
+    const lowerCase = name.toLowerCase()
+    this[lowerCase] = this[lowerCase].bind(this)
+  }
+}
+
+const { prototype } = Logger
+
+for (const name in LEVELS) {
+  const level = LEVELS[name]
+
+  prototype[name.toLowerCase()] = function (message, data) {
+    global[symbol](new Log(data, level, this._namespace, message, new Date()))
+  }
+}
+
+prototype.wrap = function (message, fn) {
+  const logger = this
+  const warnAndRethrow = error => {
+    logger.warn(message, { error })
+    throw error
+  }
+  return function () {
+    try {
+      const result = fn.apply(this, arguments)
+      const then = result != null && result.then
+      return typeof then === 'function'
+        ? then.call(result, warnAndRethrow)
+        : result
+    } catch (error) {
+      warnAndRethrow(error)
+    }
+  }
+}
+
+const createLogger = namespace => new Logger(namespace)
+export { createLogger }

@xen-orchestra/log/src/levels.js

@@ -0,0 +1,24 @@
+const LEVELS = Object.create(null)
+export { LEVELS as default }
+
+// https://github.com/trentm/node-bunyan#levels
+LEVELS.FATAL = 60 // service/app is going to down
+LEVELS.ERROR = 50 // fatal for current action
+LEVELS.WARN = 40 // something went wrong but it's not fatal
+LEVELS.INFO = 30 // detail on unusual but normal operation
+LEVELS.DEBUG = 20
+
+export const NAMES = Object.create(null)
+for (const name in LEVELS) {
+  NAMES[LEVELS[name]] = name
+}
+
+export const resolve = level => {
+  if (typeof level === 'string') {
+    level = LEVELS[level.toUpperCase()]
+  }
+  return level
+}
+
+Object.freeze(LEVELS)
+Object.freeze(NAMES)

@xen-orchestra/log/src/levels.spec.js

@@ -0,0 +1,32 @@
+/* eslint-env jest */
+
+import { forEach, isInteger } from 'lodash'
+
+import LEVELS, { NAMES, resolve } from './levels'
+
+describe('LEVELS', () => {
+  it('maps level names to their integer values', () => {
+    forEach(LEVELS, (value, name) => {
+      expect(isInteger(value)).toBe(true)
+    })
+  })
+})
+
+describe('NAMES', () => {
+  it('maps level values to their names', () => {
+    forEach(LEVELS, (value, name) => {
+      expect(NAMES[value]).toBe(name)
+    })
+  })
+})
+
+describe('resolve()', () => {
+  it('returns level values either from values or names', () => {
+    forEach(LEVELS, value => {
+      expect(resolve(value)).toBe(value)
+    })
+    forEach(NAMES, (name, value) => {
+      expect(resolve(name)).toBe(+value)
+    })
+  })
+})

@xen-orchestra/log/src/transports/console.js

@@ -0,0 +1,20 @@
+import LEVELS, { NAMES } from '../levels'
+
+// Bind console methods (necessary for browsers)
+const debugConsole = console.log.bind(console)
+const infoConsole = console.info.bind(console)
+const warnConsole = console.warn.bind(console)
+const errorConsole = console.error.bind(console)
+
+const { ERROR, INFO, WARN } = LEVELS
+
+const consoleTransport = ({ data, level, namespace, message, time }) => {
+  const fn =
+    level < INFO
+      ? debugConsole
+      : level < WARN ? infoConsole : level < ERROR ? warnConsole : errorConsole
+
+  fn('%s - %s - [%s] %s', time.toISOString(), namespace, NAMES[level], message)
+  data != null && fn(data)
+}
+export default () => consoleTransport

@xen-orchestra/log/src/transports/email.js

@@ -0,0 +1,68 @@
+import prettyFormat from 'pretty-format' // eslint-disable-line node/no-extraneous-import
+import { createTransport } from 'nodemailer' // eslint-disable-line node/no-extraneous-import
+import { fromCallback } from 'promise-toolbox'
+
+import { evalTemplate, required } from '../utils'
+import { NAMES } from '../levels'
+
+export default ({
+  // transport options (https://nodemailer.com/smtp/)
+  auth,
+  authMethod,
+  host,
+  ignoreTLS,
+  port,
+  proxy,
+  requireTLS,
+  secure,
+  service,
+  tls,
+
+  // message options (https://nodemailer.com/message/)
+  bcc,
+  cc,
+  from = required('from'),
+  to = required('to'),
+  subject = '[{{level}} - {{namespace}}] {{time}} {{message}}',
+}) => {
+  const transporter = createTransport(
+    {
+      auth,
+      authMethod,
+      host,
+      ignoreTLS,
+      port,
+      proxy,
+      requireTLS,
+      secure,
+      service,
+      tls,
+
+      disableFileAccess: true,
+      disableUrlAccess: true,
+    },
+    {
+      bcc,
+      cc,
+      from,
+      to,
+    }
+  )
+
+  return log =>
+    fromCallback(cb =>
+      transporter.sendMail(
+        {
+          subject: evalTemplate(
+            subject,
+            key =>
+              key === 'level'
+                ? NAMES[log.level]
+                : key === 'time' ? log.time.toISOString() : log[key]
+          ),
+          text: prettyFormat(log.data),
+        },
+        cb
+      )
+    )
+}

@xen-orchestra/log/src/transports/syslog.js

@@ -0,0 +1,42 @@
+import splitHost from 'split-host' // eslint-disable-line node/no-extraneous-import node/no-missing-import
+import { createClient, Facility, Severity, Transport } from 'syslog-client' // eslint-disable-line node/no-extraneous-import node/no-missing-import
+import { fromCallback } from 'promise-toolbox'
+import { startsWith } from 'lodash'
+
+import LEVELS from '../levels'
+
+// https://github.com/paulgrove/node-syslog-client#syslogseverity
+const LEVEL_TO_SEVERITY = {
+  [LEVELS.FATAL]: Severity.Critical,
+  [LEVELS.ERROR]: Severity.Error,
+  [LEVELS.WARN]: Severity.Warning,
+  [LEVELS.INFO]: Severity.Informational,
+  [LEVELS.DEBUG]: Severity.Debug,
+}
+
+const facility = Facility.User
+
+export default target => {
+  const opts = {}
+  if (target !== undefined) {
+    if (startsWith(target, 'tcp://')) {
+      target = target.slice(6)
+      opts.transport = Transport.Tcp
+    } else if (startsWith(target, 'udp://')) {
+      target = target.slice(6)
+      opts.transport = Transport.Ucp
+    }
+
+    ;({ host: target, port: opts.port } = splitHost(target))
+  }
+
+  const client = createClient(target, opts)
+
+  return log =>
+    fromCallback(cb =>
+      client.log(log.message, {
+        facility,
+        severity: LEVEL_TO_SEVERITY[log.level],
+      })
+    )
+}

@xen-orchestra/log/src/utils.js

@@ -0,0 +1,62 @@
+import escapeRegExp from 'lodash/escapeRegExp'
+
+// ===================================================================
+
+const TPL_RE = /\{\{(.+?)\}\}/g
+export const evalTemplate = (tpl, data) => {
+  const getData =
+    typeof data === 'function' ? (_, key) => data(key) : (_, key) => data[key]
+
+  return tpl.replace(TPL_RE, getData)
+}
+
+// -------------------------------------------------------------------
+
+const compileGlobPatternFragment = pattern =>
+  pattern
+    .split('*')
+    .map(escapeRegExp)
+    .join('.*')
+
+export const compileGlobPattern = pattern => {
+  const no = []
+  const yes = []
+  pattern.split(/[\s,]+/).forEach(pattern => {
+    if (pattern[0] === '-') {
+      no.push(pattern.slice(1))
+    } else {
+      yes.push(pattern)
+    }
+  })
+
+  const raw = ['^']
+
+  if (no.length !== 0) {
+    raw.push('(?!', no.map(compileGlobPatternFragment).join('|'), ')')
+  }
+
+  if (yes.length !== 0) {
+    raw.push('(?:', yes.map(compileGlobPatternFragment).join('|'), ')')
+  } else {
+    raw.push('.*')
+  }
+
+  raw.push('$')
+
+  return new RegExp(raw.join(''))
+}
+
+// -------------------------------------------------------------------
+
+export const required = name => {
+  throw new Error(`missing required arg ${name}`)
+}
+
+// -------------------------------------------------------------------
+
+export const serializeError = error => ({
+  ...error,
+  message: error.message,
+  name: error.name,
+  stack: error.stack,
+})

@xen-orchestra/log/src/utils.spec.js

@@ -0,0 +1,13 @@
+/* eslint-env jest */
+
+import { compileGlobPattern } from './utils'
+
+describe('compileGlobPattern()', () => {
+  it('works', () => {
+    const re = compileGlobPattern('foo, ba*, -bar')
+    expect(re.test('foo')).toBe(true)
+    expect(re.test('bar')).toBe(false)
+    expect(re.test('baz')).toBe(true)
+    expect(re.test('qux')).toBe(false)
+  })
+})

@xen-orchestra/log/transports

@@ -0,0 +1 @@
+dist/transports

packages/xo-server/bin/xo-server

@@ -1,31 +0,0 @@
-#!/usr/bin/env node
-
-'use strict'
-
-// ===================================================================
-
-// Better stack traces if possible.
-require('../better-stacks')
-
-// Use Bluebird for all promises as it provides better performance and
-// less memory usage.
-global.Promise = require('bluebird')
-
-// Make unhandled rejected promises visible.
-process.on('unhandledRejection', function (reason) {
-  console.warn('[Warn] Possibly unhandled rejection:', reason && reason.stack || reason)
-})
-
-;(function (EE) {
-  var proto = EE.prototype
-  var emit = proto.emit
-  proto.emit = function patchedError (event, error) {
-    if (event === 'error' && !this.listenerCount(event)) {
-      return console.warn('[Warn] Unhandled error event:', error && error.stack || error)
-    }
-
-    return emit.apply(this, arguments)
-  }
-})(require('events').EventEmitter)
-
-require('exec-promise')(require('../'))

packages/xo-server/index.js

@@ -1,11 +0,0 @@
-'use strict'
-
-// ===================================================================
-
-// Enable xo logs by default.
-if (process.env.DEBUG === undefined) {
-  process.env.DEBUG = 'app-conf,xo:*,-xo:api'
-}
-
-// Import the real main module.
-module.exports = require('./dist').default

packages/xo-server/package.json

@@ -1,6 +1,6 @@
 {
   "name": "xo-server",
-  "version": "5.19.6",
+  "version": "5.19.4",
   "license": "AGPL-3.0",
   "description": "Server part of Xen-Orchestra",
   "keywords": [
@@ -16,6 +16,9 @@
     "url": "https://github.com/vatesfr/xen-orchestra.git"
   },
   "preferGlobal": true,
+  "bin": {
+    "xo-server": "dist/cli"
+  },
   "files": [
     "better-stacks.js",
     "bin/",

packages/xo-server/src/cli.js

@@ -0,0 +1,176 @@
+#!/usr/bin/env node
+
+const APP_NAME = 'xo-server'
+
+// Enable xo logs by default.
+if (process.env.DEBUG === undefined) {
+  process.env.DEBUG = 'app-conf,xo:*,-xo:api'
+}
+
+// -------------------------------------------------------------------
+
+require('@xen-orchestra/log/configure').configure([
+  {
+    filter: process.env.DEBUG,
+    level: 'warn',
+
+    transport: require('@xen-orchestra/log/transports/console').default(),
+  },
+])
+
+const { info, warn } = require('@xen-orchestra/log').createLogger('bootstrap')
+
+process.on('unhandledRejection', reason => {
+  warn('possibly unhandled rejection', reason)
+})
+process.on('warning', warning => {
+  warn('Node warning', warning)
+})
+;(({ prototype }) => {
+  const { emit } = prototype
+  prototype.emit = function (event, error) {
+    event === 'error' && !this.listenerCount(event)
+      ? warn('unhandled error event', error)
+      : emit.apply(this, arguments)
+  }
+})(require('events').EventEmitter)
+
+// Use Bluebird for all promises as it provides better performance and
+// less memory usage.
+const Bluebird = require('bluebird')
+Bluebird.config({
+  longStackTraces: true,
+  warnings: true,
+})
+global.Promise = Bluebird
+
+// -------------------------------------------------------------------
+
+const main = async args => {
+  if (args.includes('--help') || args.includes('-h')) {
+    const { name, version } = require('../package.json')
+    return console.log(`Usage: ${name} [--safe-mode]
+
+${name} v${version}`)
+  }
+
+  info('starting')
+
+  const config = await require('app-conf').load(APP_NAME, {
+    appDir: `${__dirname}/..`,
+    ignoreUnknownFormats: true,
+  })
+
+  // Print a message if deprecated entries are specified.
+  ;['users', 'servers'].forEach(entry => {
+    if (entry in config) {
+      warn(`${entry} configuration is deprecated`)
+    }
+  })
+
+  const httpServer = require('stoppable')(new (require('http-server-plus'))())
+
+  const readFile = Bluebird.promisify(require('fs').readFile)
+  await Promise.all(
+    config.http.listen.map(
+      async ({
+        certificate,
+        // The properties was called `certificate` before.
+        cert = certificate,
+        key,
+        ...opts
+      }) => {
+        if (cert !== undefined && key !== undefined) {
+          ;[opts.cert, opts.key] = await Promise.all([
+            readFile(cert),
+            readFile(key),
+          ])
+        }
+
+        try {
+          const niceAddress = await httpServer.listen(opts)
+          info(`web server listening on ${niceAddress}`)
+        } catch (error) {
+          if (error.niceAddress !== undefined) {
+            warn(`web server could not listen on ${error.niceAddress}`)
+
+            const { code } = error
+            if (code === 'EACCES') {
+              warn('  access denied.')
+              warn('  ports < 1024 are often reserved to privileges users.')
+            } else if (code === 'EADDRINUSE') {
+              warn('  address already in use.')
+            }
+          } else {
+            warn('web server could not listen', error)
+          }
+        }
+      }
+    )
+  )
+
+  // Now the web server is listening, drop privileges.
+  try {
+    const { group, user } = config
+    if (group !== undefined) {
+      process.setgid(group)
+      info('group changed to', group)
+    }
+    if (user !== undefined) {
+      process.setuid(user)
+      info('user changed to', user)
+    }
+  } catch (error) {
+    warn('failed to change group/user', error)
+  }
+
+  const child = require('child_process').fork(require.resolve('./worker.js'))
+  child.send([''])
+
+  const App = require('./xo').default
+  const app = new App({
+    appName: APP_NAME,
+    config,
+    httpServer,
+    safeMode: require('lodash/includes')(args, '--safe-mode'),
+  })
+
+  // Register web server close on XO stop.
+  app.on('stop', () => Bluebird.fromCallback(cb => httpServer.stop(cb)))
+
+  await app.start()
+
+  // Trigger a clean job.
+  await app.clean()
+
+  // Gracefully shutdown on signals.
+  //
+  // TODO: implements a timeout? (or maybe it is the services launcher
+  // responsibility?)
+  require('lodash/forEach')(['SIGINT', 'SIGTERM'], signal => {
+    let alreadyCalled = false
+
+    process.on(signal, () => {
+      if (alreadyCalled) {
+        warn('forced exit')
+        process.exit(1)
+      }
+      alreadyCalled = true
+
+      info(`${signal} caught, closing…`)
+      app.stop()
+    })
+  })
+
+  await require('event-to-promise')(app, 'stopped')
+}
+main(process.argv.slice(2)).then(
+  () => info('bye :-)'),
+  error => {
+    if (typeof error === 'number') {
+      process.exitCode = error
+    } else {
+      warn('fatal error', error)
+    }
+  }
+)

packages/xo-server/src/front/index.js

@@ -0,0 +1,348 @@
+const compilePug = require('pug').compile
+const createProxyServer = require('http-proxy').createServer
+const JsonRpcPeer = require('json-rpc-peer')
+const LocalStrategy = require('passport-local').Strategy
+const parseCookies = require('cookie').parse
+const Passport = require('passport')
+const serveStatic = require('serve-static')
+const WebSocket = require('ws')
+const { fromCallback } = require('promise-toolbox')
+const { invalidCredentials } = require('xo-common/api-errors')
+const { readFile } = require('fs')
+
+const proxyConsole = require('../proxy-console')
+
+const { debug, warn } = require('@xen-orchestra/log').createLogger('front')
+
+function createExpressApp ({ http: config }, httpServer) {
+  const express = require('express')()
+
+  express.use(require('helmet')())
+
+  if (config.redirectToHttps) {
+    const https = config.listen.find(
+      _ =>
+        _.port !== undefined &&
+        (_.cert !== undefined || _.certificate !== undefined)
+    )
+
+    if (https === undefined) {
+      warn('could not setup HTTPs redirection: no HTTPs config found')
+    } else {
+      const { port } = https
+      express.use((req, res, next) => {
+        if (req.secure) {
+          return next()
+        }
+
+        res.redirect(`https://${req.hostname}:${port}${req.originalUrl}`)
+      })
+    }
+  }
+
+  Object.keys(config.mounts).forEach(url => {
+    const paths = config.mounts[url]
+    ;(Array.isArray(paths) ? paths : [paths]).forEach(path => {
+      debug('Setting up %s → %s', url, path)
+
+      express.use(url, serveStatic(path))
+    })
+  })
+
+  return express
+}
+
+function setUpApi (config, httpServer, xo) {
+  const webSocketServer = new WebSocket.Server({
+    noServer: true,
+  })
+  xo.on('stop', () => fromCallback(cb => webSocketServer.close(cb)))
+
+  const onConnection = (socket, upgradeReq) => {
+    const { remoteAddress } = upgradeReq.socket
+
+    debug('+ WebSocket connection (%s)', remoteAddress)
+
+    // Create the abstract XO object for this connection.
+    const connection = xo.createUserConnection()
+    connection.once('close', () => {
+      socket.close()
+    })
+
+    // Create the JSON-RPC server for this connection.
+    const jsonRpc = new JsonRpcPeer(message => {
+      if (message.type === 'request') {
+        return xo.callApiMethod(connection, message.method, message.params)
+      }
+    })
+    connection.notify = jsonRpc.notify.bind(jsonRpc)
+
+    // Close the XO connection with this WebSocket.
+    socket.once('close', () => {
+      debug('- WebSocket connection (%s)', remoteAddress)
+
+      connection.close()
+    })
+
+    // Connect the WebSocket to the JSON-RPC server.
+    socket.on('message', message => {
+      jsonRpc.write(message)
+    })
+
+    const onSend = error => {
+      if (error) {
+        warn('WebSocket send:', error.stack)
+      }
+    }
+    jsonRpc.on('data', data => {
+      // The socket may have been closed during the API method
+      // execution.
+      if (socket.readyState === WebSocket.OPEN) {
+        socket.send(data, onSend)
+      }
+    })
+  }
+  httpServer.on('upgrade', (req, socket, head) => {
+    if (req.url === '/api/') {
+      webSocketServer.handleUpgrade(req, socket, head, ws =>
+        onConnection(ws, req)
+      )
+    }
+  })
+}
+
+function setUpConsoleProxy (httpServer, xo) {
+  const webSocketServer = new WebSocket.Server({
+    noServer: true,
+  })
+
+  const CONSOLE_PROXY_PATH_RE = /^\/api\/consoles\/(.*)$/
+  httpServer.on('upgrade', async (req, socket, head) => {
+    const matches = CONSOLE_PROXY_PATH_RE.exec(req.url)
+    if (!matches) {
+      return
+    }
+
+    const [, id] = matches
+    try {
+      // TODO: factorize permissions checking in an Express middleware.
+      {
+        const { token } = parseCookies(req.headers.cookie)
+
+        const user = await xo.authenticateUser({ token })
+        if (!await xo.hasPermissions(user.id, [[id, 'operate']])) {
+          throw invalidCredentials()
+        }
+
+        const { remoteAddress } = socket
+        debug('+ Console proxy (%s - %s)', user.name, remoteAddress)
+        socket.on('close', () => {
+          debug('- Console proxy (%s - %s)', user.name, remoteAddress)
+        })
+      }
+
+      const xapi = xo.getXapi(id, ['VM', 'VM-controller'])
+      const vmConsole = xapi.getVmConsole(id)
+
+      // FIXME: lost connection due to VM restart is not detected.
+      webSocketServer.handleUpgrade(req, socket, head, connection => {
+        proxyConsole(connection, vmConsole, xapi.sessionId)
+      })
+    } catch (error) {
+      console.error((error && error.stack) || error)
+    }
+  })
+}
+
+async function setUpPassport (express, xo) {
+  // necessary for connect-flash
+  express.use(require('cookie-parser')())
+  express.use(
+    require('express-session')({
+      resave: false,
+      saveUninitialized: false,
+
+      // TODO: should be in the config file.
+      secret: 'CLWguhRZAZIXZcbrMzHCYmefxgweItKnS',
+    })
+  )
+
+  // necessary for Passport to display error messages
+  express.use(require('connect-flash')())
+
+  // necessary for Passport to access the username and password from the sign
+  // in form
+  express.use(require('body-parser').urlencoded({ extended: false }))
+
+  express.use(Passport.initialize())
+
+  const strategies = { __proto__: null }
+  xo.registerPassportStrategy = strategy => {
+    Passport.use(strategy)
+
+    const { name } = strategy
+    if (name !== 'local') {
+      strategies[name] = strategy.label || name
+    }
+  }
+
+  // Registers the sign in form.
+  const signInPage = compilePug(
+    await fromCallback(cb => readFile(`${__dirname}/../signin.pug`, cb))
+  )
+  express.get('/signin', (req, res, next) => {
+    res.send(
+      signInPage({
+        error: req.flash('error')[0],
+        strategies,
+      })
+    )
+  })
+
+  express.get('/signout', (req, res) => {
+    res.clearCookie('token')
+    res.redirect('/')
+  })
+
+  const SIGNIN_STRATEGY_RE = /^\/signin\/([^/]+)(\/callback)?(:?\?.*)?$/
+  express.use(async (req, res, next) => {
+    const { url } = req
+    const matches = url.match(SIGNIN_STRATEGY_RE)
+
+    if (matches !== null) {
+      return Passport.authenticate(matches[1], async (err, user, info) => {
+        if (err) {
+          return next(err)
+        }
+
+        if (!user) {
+          req.flash('error', info ? info.message : 'Invalid credentials')
+          return res.redirect('/signin')
+        }
+
+        // The cookie will be set in via the next request because some
+        // browsers do not save cookies on redirect.
+        req.flash(
+          'token',
+          (await xo.createAuthenticationToken({ userId: user.id })).id
+        )
+
+        // The session is only persistent for internal provider and if 'Remember me' box is checked
+        req.flash(
+          'session-is-persistent',
+          matches[1] === 'local' && req.body['remember-me'] === 'on'
+        )
+
+        res.redirect(req.flash('return-url')[0] || '/')
+      })(req, res, next)
+    }
+
+    const token = req.flash('token')[0]
+
+    if (token) {
+      const isPersistent = req.flash('session-is-persistent')[0]
+
+      if (isPersistent) {
+        // Persistent cookie ? => 1 year
+        res.cookie('token', token, { maxAge: 1000 * 60 * 60 * 24 * 365 })
+      } else {
+        // Non-persistent : external provider as Github, Twitter...
+        res.cookie('token', token)
+      }
+
+      next()
+    } else if (req.cookies.token) {
+      next()
+    } else if (
+      /favicon|fontawesome|images|styles|\.(?:css|jpg|png)$/.test(url)
+    ) {
+      next()
+    } else {
+      req.flash('return-url', url)
+      return res.redirect('/signin')
+    }
+  })
+
+  // Install the local strategy.
+  xo.registerPassportStrategy(
+    new LocalStrategy(async (username, password, done) => {
+      try {
+        const user = await xo.authenticateUser({ username, password })
+        done(null, user)
+      } catch (error) {
+        done(null, false, { message: error.message })
+      }
+    })
+  )
+}
+
+function setUpProxies ({ http: { proxies } }, httpServer, express, xo) {
+  if (proxies === undefined) {
+    return
+  }
+
+  const proxy = createProxyServer({
+    ignorePath: true,
+  }).on('error', error => console.error(error))
+
+  const prefixes = Object.keys(proxies).sort((a, b) => a.length - b.length)
+  const n = prefixes.length
+
+  // HTTP request proxy.
+  express.use((req, res, next) => {
+    const { url } = req
+
+    for (let i = 0; i < n; ++i) {
+      const prefix = prefixes[i]
+      if (url.startsWith(prefix)) {
+        const target = proxies[prefix]
+
+        proxy.web(req, res, {
+          target: target + url.slice(prefix.length),
+        })
+
+        return
+      }
+    }
+
+    next()
+  })
+
+  // WebSocket proxy.
+  const webSocketServer = new WebSocket.Server({
+    noServer: true,
+  })
+  xo.on('stop', () => fromCallback(cb => webSocketServer.close(cb)))
+
+  httpServer.on('upgrade', (req, socket, head) => {
+    const { url } = req
+
+    for (let i = 0; i < n; ++i) {
+      const prefix = prefixes[i]
+      if (url.startsWith(prefix)) {
+        const target = proxies[prefix]
+
+        proxy.ws(req, socket, head, {
+          target: target + url.slice(prefix.length),
+        })
+
+        return
+      }
+    }
+  })
+}
+
+export default async function main ({ config, httpServer, safeMode }) {
+  const express = createExpressApp(config, httpServer)
+
+  setUpProxies(config, httpServer, express, xo)
+
+  setUpApi(config, httpServer, xo)
+
+  // must be set up before the API
+  setUpConsoleProxy(httpServer, xo)
+
+  await setUpPassport(express, xo)
+
+  // TODO: express.use(xo._handleHttpRequest.bind(xo))
+}

packages/xo-server/src/index.js

@@ -1,656 +0,0 @@
-import appConf from 'app-conf'
-import bind from 'lodash/bind'
-import blocked from 'blocked'
-import createExpress from 'express'
-import createLogger from 'debug'
-import has from 'lodash/has'
-import helmet from 'helmet'
-import includes from 'lodash/includes'
-import proxyConsole from './proxy-console'
-import serveStatic from 'serve-static'
-import startsWith from 'lodash/startsWith'
-import stoppable from 'stoppable'
-import WebSocket from 'ws'
-import { compile as compilePug } from 'pug'
-import { createServer as createProxyServer } from 'http-proxy'
-import { fromEvent } from 'promise-toolbox'
-import { join as joinPath } from 'path'
-
-import JsonRpcPeer from 'json-rpc-peer'
-import { invalidCredentials } from 'xo-common/api-errors'
-import { ensureDir, readdir, readFile } from 'fs-extra'
-
-import WebServer from 'http-server-plus'
-import Xo from './xo'
-import {
-  forEach,
-  isArray,
-  isFunction,
-  mapToArray,
-  pFromCallback,
-} from './utils'
-
-import bodyParser from 'body-parser'
-import connectFlash from 'connect-flash'
-import cookieParser from 'cookie-parser'
-import expressSession from 'express-session'
-import passport from 'passport'
-import { parse as parseCookies } from 'cookie'
-import { Strategy as LocalStrategy } from 'passport-local'
-
-// ===================================================================
-
-const debug = createLogger('xo:main')
-
-const warn = (...args) => {
-  console.warn('[Warn]', ...args)
-}
-
-// ===================================================================
-
-const DEPRECATED_ENTRIES = ['users', 'servers']
-
-async function loadConfiguration () {
-  const config = await appConf.load('xo-server', {
-    appDir: joinPath(__dirname, '..'),
-    ignoreUnknownFormats: true,
-  })
-
-  debug('Configuration loaded.')
-
-  // Print a message if deprecated entries are specified.
-  forEach(DEPRECATED_ENTRIES, entry => {
-    if (has(config, entry)) {
-      warn(`${entry} configuration is deprecated.`)
-    }
-  })
-
-  return config
-}
-
-// ===================================================================
-
-function createExpressApp () {
-  const app = createExpress()
-
-  app.use(helmet())
-
-  // Registers the cookie-parser and express-session middlewares,
-  // necessary for connect-flash.
-  app.use(cookieParser())
-  app.use(
-    expressSession({
-      resave: false,
-      saveUninitialized: false,
-
-      // TODO: should be in the config file.
-      secret: 'CLWguhRZAZIXZcbrMzHCYmefxgweItKnS',
-    })
-  )
-
-  // Registers the connect-flash middleware, necessary for Passport to
-  // display error messages.
-  app.use(connectFlash())
-
-  // Registers the body-parser middleware, necessary for Passport to
-  // access the username and password from the sign in form.
-  app.use(bodyParser.urlencoded({ extended: false }))
-
-  // Registers Passport's middlewares.
-  app.use(passport.initialize())
-
-  return app
-}
-
-async function setUpPassport (express, xo) {
-  const strategies = { __proto__: null }
-  xo.registerPassportStrategy = strategy => {
-    passport.use(strategy)
-
-    const { name } = strategy
-    if (name !== 'local') {
-      strategies[name] = strategy.label || name
-    }
-  }
-
-  // Registers the sign in form.
-  const signInPage = compilePug(
-    await readFile(joinPath(__dirname, '..', 'signin.pug'))
-  )
-  express.get('/signin', (req, res, next) => {
-    res.send(
-      signInPage({
-        error: req.flash('error')[0],
-        strategies,
-      })
-    )
-  })
-
-  express.get('/signout', (req, res) => {
-    res.clearCookie('token')
-    res.redirect('/')
-  })
-
-  const SIGNIN_STRATEGY_RE = /^\/signin\/([^/]+)(\/callback)?(:?\?.*)?$/
-  express.use(async (req, res, next) => {
-    const { url } = req
-    const matches = url.match(SIGNIN_STRATEGY_RE)
-
-    if (matches) {
-      return passport.authenticate(matches[1], async (err, user, info) => {
-        if (err) {
-          return next(err)
-        }
-
-        if (!user) {
-          req.flash('error', info ? info.message : 'Invalid credentials')
-          return res.redirect('/signin')
-        }
-
-        // The cookie will be set in via the next request because some
-        // browsers do not save cookies on redirect.
-        req.flash(
-          'token',
-          (await xo.createAuthenticationToken({ userId: user.id })).id
-        )
-
-        // The session is only persistent for internal provider and if 'Remember me' box is checked
-        req.flash(
-          'session-is-persistent',
-          matches[1] === 'local' && req.body['remember-me'] === 'on'
-        )
-
-        res.redirect(req.flash('return-url')[0] || '/')
-      })(req, res, next)
-    }
-
-    const token = req.flash('token')[0]
-
-    if (token) {
-      const isPersistent = req.flash('session-is-persistent')[0]
-
-      if (isPersistent) {
-        // Persistent cookie ? => 1 year
-        res.cookie('token', token, { maxAge: 1000 * 60 * 60 * 24 * 365 })
-      } else {
-        // Non-persistent : external provider as Github, Twitter...
-        res.cookie('token', token)
-      }
-
-      next()
-    } else if (req.cookies.token) {
-      next()
-    } else if (
-      /favicon|fontawesome|images|styles|\.(?:css|jpg|png)$/.test(url)
-    ) {
-      next()
-    } else {
-      req.flash('return-url', url)
-      return res.redirect('/signin')
-    }
-  })
-
-  // Install the local strategy.
-  xo.registerPassportStrategy(
-    new LocalStrategy(async (username, password, done) => {
-      try {
-        const user = await xo.authenticateUser({ username, password })
-        done(null, user)
-      } catch (error) {
-        done(null, false, { message: error.message })
-      }
-    })
-  )
-}
-
-// ===================================================================
-
-async function registerPlugin (pluginPath, pluginName) {
-  const plugin = require(pluginPath)
-  const { description, version = 'unknown' } = (() => {
-    try {
-      return require(pluginPath + '/package.json')
-    } catch (_) {
-      return {}
-    }
-  })()
-
-  // Supports both “normal” CommonJS and Babel's ES2015 modules.
-  const {
-    default: factory = plugin,
-    configurationSchema,
-    configurationPresets,
-    testSchema,
-  } = plugin
-
-  // The default export can be either a factory or directly a plugin
-  // instance.
-  const instance = isFunction(factory)
-    ? factory({
-      xo: this,
-      getDataDir: () => {
-        const dir = `${this._config.datadir}/${pluginName}`
-        return ensureDir(dir).then(() => dir)
-      },
-    })
-    : factory
-
-  await this.registerPlugin(
-    pluginName,
-    instance,
-    configurationSchema,
-    configurationPresets,
-    description,
-    testSchema,
-    version
-  )
-}
-
-const debugPlugin = createLogger('xo:plugin')
-
-function registerPluginWrapper (pluginPath, pluginName) {
-  debugPlugin('register %s', pluginName)
-
-  return registerPlugin.call(this, pluginPath, pluginName).then(
-    () => {
-      debugPlugin(`successfully register ${pluginName}`)
-    },
-    error => {
-      debugPlugin(`failed register ${pluginName}`)
-      debugPlugin(error)
-    }
-  )
-}
-
-const PLUGIN_PREFIX = 'xo-server-'
-const PLUGIN_PREFIX_LENGTH = PLUGIN_PREFIX.length
-
-async function registerPluginsInPath (path) {
-  const files = await readdir(path).catch(error => {
-    if (error.code === 'ENOENT') {
-      return []
-    }
-    throw error
-  })
-
-  await Promise.all(
-    mapToArray(files, name => {
-      if (startsWith(name, PLUGIN_PREFIX)) {
-        return registerPluginWrapper.call(
-          this,
-          `${path}/${name}`,
-          name.slice(PLUGIN_PREFIX_LENGTH)
-        )
-      }
-    })
-  )
-}
-
-async function registerPlugins (xo) {
-  await Promise.all(
-    mapToArray(
-      [`${__dirname}/../node_modules/`, '/usr/local/lib/node_modules/'],
-      xo::registerPluginsInPath
-    )
-  )
-}
-
-// ===================================================================
-
-async function makeWebServerListen (
-  webServer,
-  {
-    certificate,
-
-    // The properties was called `certificate` before.
-    cert = certificate,
-
-    key,
-    ...opts
-  }
-) {
-  if (cert && key) {
-    ;[opts.cert, opts.key] = await Promise.all([readFile(cert), readFile(key)])
-  }
-  try {
-    const niceAddress = await webServer.listen(opts)
-    debug(`Web server listening on ${niceAddress}`)
-  } catch (error) {
-    if (error.niceAddress) {
-      warn(`Web server could not listen on ${error.niceAddress}`)
-
-      const { code } = error
-      if (code === 'EACCES') {
-        warn('  Access denied.')
-        warn('  Ports < 1024 are often reserved to privileges users.')
-      } else if (code === 'EADDRINUSE') {
-        warn('  Address already in use.')
-      }
-    } else {
-      warn('Web server could not listen:', error.message)
-    }
-  }
-}
-
-async function createWebServer ({ listen, listenOptions }) {
-  const webServer = stoppable(new WebServer())
-
-  await Promise.all(
-    mapToArray(listen, opts =>
-      makeWebServerListen(webServer, { ...listenOptions, ...opts })
-    )
-  )
-
-  return webServer
-}
-
-// ===================================================================
-
-const setUpProxies = (express, opts, xo) => {
-  if (!opts) {
-    return
-  }
-
-  const proxy = createProxyServer({
-    ignorePath: true,
-  }).on('error', error => console.error(error))
-
-  // TODO: sort proxies by descending prefix length.
-
-  // HTTP request proxy.
-  express.use((req, res, next) => {
-    const { url } = req
-
-    for (const prefix in opts) {
-      if (startsWith(url, prefix)) {
-        const target = opts[prefix]
-
-        proxy.web(req, res, {
-          target: target + url.slice(prefix.length),
-        })
-
-        return
-      }
-    }
-
-    next()
-  })
-
-  // WebSocket proxy.
-  const webSocketServer = new WebSocket.Server({
-    noServer: true,
-  })
-  xo.on('stop', () => pFromCallback(cb => webSocketServer.close(cb)))
-
-  express.on('upgrade', (req, socket, head) => {
-    const { url } = req
-
-    for (const prefix in opts) {
-      if (startsWith(url, prefix)) {
-        const target = opts[prefix]
-
-        proxy.ws(req, socket, head, {
-          target: target + url.slice(prefix.length),
-        })
-
-        return
-      }
-    }
-  })
-}
-
-// ===================================================================
-
-const setUpStaticFiles = (express, opts) => {
-  forEach(opts, (paths, url) => {
-    if (!isArray(paths)) {
-      paths = [paths]
-    }
-
-    forEach(paths, path => {
-      debug('Setting up %s → %s', url, path)
-
-      express.use(url, serveStatic(path))
-    })
-  })
-}
-
-// ===================================================================
-
-const setUpApi = (webServer, xo, verboseLogsOnErrors) => {
-  const webSocketServer = new WebSocket.Server({
-    noServer: true,
-  })
-  xo.on('stop', () => pFromCallback(cb => webSocketServer.close(cb)))
-
-  const onConnection = (socket, upgradeReq) => {
-    const { remoteAddress } = upgradeReq.socket
-
-    debug('+ WebSocket connection (%s)', remoteAddress)
-
-    // Create the abstract XO object for this connection.
-    const connection = xo.createUserConnection()
-    connection.once('close', () => {
-      socket.close()
-    })
-
-    // Create the JSON-RPC server for this connection.
-    const jsonRpc = new JsonRpcPeer(message => {
-      if (message.type === 'request') {
-        return xo.callApiMethod(connection, message.method, message.params)
-      }
-    })
-    connection.notify = bind(jsonRpc.notify, jsonRpc)
-
-    // Close the XO connection with this WebSocket.
-    socket.once('close', () => {
-      debug('- WebSocket connection (%s)', remoteAddress)
-
-      connection.close()
-    })
-
-    // Connect the WebSocket to the JSON-RPC server.
-    socket.on('message', message => {
-      jsonRpc.write(message)
-    })
-
-    const onSend = error => {
-      if (error) {
-        warn('WebSocket send:', error.stack)
-      }
-    }
-    jsonRpc.on('data', data => {
-      // The socket may have been closed during the API method
-      // execution.
-      if (socket.readyState === WebSocket.OPEN) {
-        socket.send(data, onSend)
-      }
-    })
-  }
-  webServer.on('upgrade', (req, socket, head) => {
-    if (req.url === '/api/') {
-      webSocketServer.handleUpgrade(req, socket, head, ws =>
-        onConnection(ws, req)
-      )
-    }
-  })
-}
-
-// ===================================================================
-
-const CONSOLE_PROXY_PATH_RE = /^\/api\/consoles\/(.*)$/
-
-const setUpConsoleProxy = (webServer, xo) => {
-  const webSocketServer = new WebSocket.Server({
-    noServer: true,
-  })
-  xo.on('stop', () => pFromCallback(cb => webSocketServer.close(cb)))
-
-  webServer.on('upgrade', async (req, socket, head) => {
-    const matches = CONSOLE_PROXY_PATH_RE.exec(req.url)
-    if (!matches) {
-      return
-    }
-
-    const [, id] = matches
-    try {
-      // TODO: factorize permissions checking in an Express middleware.
-      {
-        const { token } = parseCookies(req.headers.cookie)
-
-        const user = await xo.authenticateUser({ token })
-        if (!await xo.hasPermissions(user.id, [[id, 'operate']])) {
-          throw invalidCredentials()
-        }
-
-        const { remoteAddress } = socket
-        debug('+ Console proxy (%s - %s)', user.name, remoteAddress)
-        socket.on('close', () => {
-          debug('- Console proxy (%s - %s)', user.name, remoteAddress)
-        })
-      }
-
-      const xapi = xo.getXapi(id, ['VM', 'VM-controller'])
-      const vmConsole = xapi.getVmConsole(id)
-
-      // FIXME: lost connection due to VM restart is not detected.
-      webSocketServer.handleUpgrade(req, socket, head, connection => {
-        proxyConsole(connection, vmConsole, xapi.sessionId)
-      })
-    } catch (error) {
-      console.error((error && error.stack) || error)
-    }
-  })
-}
-
-// ===================================================================
-
-const USAGE = (({ name, version }) => `Usage: ${name} [--safe-mode]
-
-${name} v${version}`)(require('../package.json'))
-
-// ===================================================================
-
-export default async function main (args) {
-  if (includes(args, '--help') || includes(args, '-h')) {
-    return USAGE
-  }
-
-  {
-    const debug = createLogger('xo:perf')
-    blocked(
-      ms => {
-        debug('blocked for %sms', ms | 0)
-      },
-      {
-        threshold: 50,
-      }
-    )
-  }
-
-  const config = await loadConfiguration()
-
-  const webServer = await createWebServer(config.http)
-
-  // Now the web server is listening, drop privileges.
-  try {
-    const { user, group } = config
-    if (group) {
-      process.setgid(group)
-      debug('Group changed to', group)
-    }
-    if (user) {
-      process.setuid(user)
-      debug('User changed to', user)
-    }
-  } catch (error) {
-    warn('Failed to change user/group:', error)
-  }
-
-  // Creates main object.
-  const xo = new Xo(config)
-
-  // Register web server close on XO stop.
-  xo.on('stop', () => pFromCallback(cb => webServer.stop(cb)))
-
-  // Connects to all registered servers.
-  await xo.start()
-
-  // Trigger a clean job.
-  await xo.clean()
-
-  // Express is used to manage non WebSocket connections.
-  const express = createExpressApp()
-
-  if (config.http.redirectToHttps) {
-    let port
-    forEach(config.http.listen, listen => {
-      if (listen.port && (listen.cert || listen.certificate)) {
-        port = listen.port
-        return false
-      }
-    })
-
-    if (port === undefined) {
-      warn('Could not setup HTTPs redirection: no HTTPs port found')
-    } else {
-      express.use((req, res, next) => {
-        if (req.secure) {
-          return next()
-        }
-
-        res.redirect(`https://${req.hostname}:${port}${req.originalUrl}`)
-      })
-    }
-  }
-
-  // Must be set up before the API.
-  setUpConsoleProxy(webServer, xo)
-
-  // Must be set up before the API.
-  express.use(bind(xo._handleHttpRequest, xo))
-
-  // Everything above is not protected by the sign in, allowing xo-cli
-  // to work properly.
-  await setUpPassport(express, xo)
-
-  // Attaches express to the web server.
-  webServer.on('request', express)
-  webServer.on('upgrade', (req, socket, head) => {
-    express.emit('upgrade', req, socket, head)
-  })
-
-  // Must be set up before the static files.
-  setUpApi(webServer, xo, config.verboseApiLogsOnErrors)
-
-  setUpProxies(express, config.http.proxies, xo)
-
-  setUpStaticFiles(express, config.http.mounts)
-
-  if (!includes(args, '--safe-mode')) {
-    await registerPlugins(xo)
-  }
-
-  // Gracefully shutdown on signals.
-  //
-  // TODO: implements a timeout? (or maybe it is the services launcher
-  // responsibility?)
-  forEach(['SIGINT', 'SIGTERM'], signal => {
-    let alreadyCalled = false
-
-    process.on(signal, () => {
-      if (alreadyCalled) {
-        warn('forced exit')
-        process.exit(1)
-      }
-      alreadyCalled = true
-
-      debug('%s caught, closing…', signal)
-      xo.stop()
-    })
-  })
-
-  await fromEvent(xo, 'stopped')
-
-  debug('bye :-)')
-}

packages/xo-server/src/worker-wrapper.js

@@ -0,0 +1,3 @@
+process.on('message', ([action, ...args]) => {
+  console.log(action, args)
+})

packages/xo-server/src/worker.js

@@ -0,0 +1,143 @@
+import blocked from 'blocked'
+import { createLogger } from '@xen-orchestra/log'
+import { fromEvent } from 'promise-toolbox'
+
+import { ensureDir, readdir } from 'fs-extra'
+
+import Xo from './xo'
+
+// ===================================================================
+
+const { debug } = createLogger('xo:main')
+
+// ===================================================================
+
+async function registerPlugin (pluginPath, pluginName) {
+  const plugin = require(pluginPath)
+  const { description, version = 'unknown' } = (() => {
+    try {
+      return require(pluginPath + '/package.json')
+    } catch (_) {
+      return {}
+    }
+  })()
+
+  // Supports both “normal” CommonJS and Babel's ES2015 modules.
+  const {
+    default: factory = plugin,
+    configurationSchema,
+    configurationPresets,
+    testSchema,
+  } = plugin
+
+  // The default export can be either a factory or directly a plugin
+  // instance.
+  const instance =
+    typeof factory === 'function'
+      ? factory({
+        xo: this,
+        getDataDir: () => {
+          const dir = `${this._config.datadir}/${pluginName}`
+          return ensureDir(dir).then(() => dir)
+        },
+      })
+      : factory
+
+  await this.registerPlugin(
+    pluginName,
+    instance,
+    configurationSchema,
+    configurationPresets,
+    description,
+    testSchema,
+    version
+  )
+}
+
+const debugPlugin = createLogger('xo:plugin')
+
+function registerPluginWrapper (pluginPath, pluginName) {
+  debugPlugin('register %s', pluginName)
+
+  return registerPlugin.call(this, pluginPath, pluginName).then(
+    () => {
+      debugPlugin(`successfully register ${pluginName}`)
+    },
+    error => {
+      debugPlugin(`failed register ${pluginName}`)
+      debugPlugin(error)
+    }
+  )
+}
+
+const PLUGIN_PREFIX = 'xo-server-'
+const PLUGIN_PREFIX_LENGTH = PLUGIN_PREFIX.length
+
+async function registerPluginsInPath (path) {
+  const files = await readdir(path).catch(error => {
+    if (error.code === 'ENOENT') {
+      return []
+    }
+    throw error
+  })
+
+  await Promise.all(
+    files.map(name => {
+      if (name.startsWith(PLUGIN_PREFIX)) {
+        return registerPluginWrapper.call(
+          this,
+          `${path}/${name}`,
+          name.slice(PLUGIN_PREFIX_LENGTH)
+        )
+      }
+    })
+  )
+}
+
+async function registerPlugins (xo) {
+  await Promise.all(
+    [`${__dirname}/../node_modules/`, '/usr/local/lib/node_modules/'].map(
+      xo::registerPluginsInPath
+    )
+  )
+}
+
+// ===================================================================
+
+async function main ({ config, safeMode }) {
+  {
+    const debug = createLogger('xo:perf')
+    blocked(ms => {
+      debug('blocked for %sms', ms | 0)
+    })
+  }
+
+  // Creates main object.
+  const xo = new Xo(config)
+
+  // Connects to all registered servers.
+  await xo.start()
+
+  // Trigger a clean job.
+  await xo.clean()
+
+  if (!safeMode) {
+    await registerPlugins(xo)
+  }
+
+  await new Promise(resolve => {
+    const onMessage = message => {
+      if (message[0] === 'STOP') {
+        process.removeListener('message', onMessage)
+        resolve()
+      }
+    }
+    process.on('message', onMessage)
+  })
+
+  await fromEvent(xo, 'stopped')
+}
+main().then(
+  () => process.send(['STOPPED']),
+  error => process.send(['STOPPED_WITH_ERROR', error])
+)

packages/xo-server/src/xo-mixins/backups-ng/index.js

@@ -15,7 +15,7 @@ import {
   noop,
   values,
 } from 'lodash'
-import { fromEvent as pFromEvent, timeout as pTimeout } from 'promise-toolbox'
+import { timeout as pTimeout } from 'promise-toolbox'
 import Vhd, {
   chainVhd,
   createSyntheticStream as createVhdReadStream,
@@ -304,7 +304,6 @@ const writeStream = async (
   const output = await handler.createOutputStream(tmpPath, { checksum })
   try {
     input.pipe(output)
-    await pFromEvent(output, 'finish')
     await output.checksumWritten
     // $FlowFixMe
     await input.task
@@ -660,7 +659,7 @@ export default class BackupNg {
   //       2. next run should be a full
   // - [ ] add a lock on the job/VDI during merge which should prevent other merges and restoration
   // - [ ] check merge/transfert duration/size are what we want for delta
-  // - [ ] in case of failure, correctly clean VHDs for all VDIs
+  // - [ ] fix backup reports
   //
   // Low:
   // - [ ] jobs should be cancelable
@@ -693,7 +692,6 @@ export default class BackupNg {
   // - [x] replicated VMs should be discriminated by VM (vatesfr/xen-orchestra#2807)
   // - [x] clones of replicated VMs should not be garbage collected
   // - [x] import for delta
-  // - [x] fix backup reports
   @defer
   async _backupVm (
     $defer: any,
@@ -1330,16 +1328,11 @@ export default class BackupNg {
         case 'task.end':
           const task = logs[data.taskId]
           if (task !== undefined) {
-            // work-around
-            if (time === task.start && message === 'merge') {
-              delete logs[data.taskId]
-            } else {
-              task.status = data.status
-              task.taskId = data.taskId
-              task.result = data.result
-              task.end = time
-              task.duration = time - task.start
-            }
+            task.status = data.status
+            task.taskId = data.taskId
+            task.result = data.result
+            task.end = time
+            task.duration = time - task.start
           }
       }
     })

packages/xo-web/package.json

@@ -1,7 +1,7 @@
 {
   "private": false,
   "name": "xo-web",
-  "version": "5.19.4",
+  "version": "5.19.2",
   "license": "AGPL-3.0",
   "description": "Web interface client for Xen-Orchestra",
   "keywords": [

packages/xo-web/src/common/intl/locales/fr.js

@@ -3857,8 +3857,7 @@ export default {
   xosanUsedSpace: 'Espace utilisé',
 
   // Original text: "XOSAN pack needs to be installed on each host of the pool."
-  xosanNeedPack:
-    'Le pack XOSAN doit être installé et à jour sur tous les hôtes du pool.',
+  xosanNeedPack: 'La pack XOSAN doit être installé sur tous les hôtes du pool.',
 
   // Original text: "Install it now!"
   xosanInstallIt: 'Installer maintenant !',

packages/xo-web/src/common/intl/messages.js

@@ -1766,8 +1766,7 @@ const messages = {
   xosanUsedSpace: 'Used space',
   xosanLicense: 'License',
   xosanMultipleLicenses: 'This XOSAN has more than 1 license!',
-  xosanNeedPack:
-    'XOSAN pack needs to be installed and up to date on each host of the pool.',
+  xosanNeedPack: 'XOSAN pack needs to be installed on each host of the pool.',
   xosanInstallIt: 'Install it now!',
   xosanNeedRestart:
     'Some hosts need their toolstack to be restarted before you can create an XOSAN',
@@ -1795,14 +1794,6 @@ const messages = {
   xosanPbdsDetached: 'Some SRs are detached from the XOSAN',
   xosanBadStatus: 'Something is wrong with: {badStatuses}',
   xosanRunning: 'Running',
-  xosanUpdatePacks: 'Update packs',
-  xosanPackUpdateChecking: 'Checking for updates',
-  xosanPackUpdateError:
-    'Error while checking XOSAN packs. Please make sure that the Cloud plugin is installed and loaded and that the updater is reachable.',
-  xosanPackUpdateUnavailable: 'XOSAN resources are unavailable',
-  xosanPackUpdateUnregistered: 'Not registered for XOSAN resources',
-  xosanPackUpdateUpToDate: "✓ This pool's XOSAN packs are up to date!",
-  xosanPackUpdateVersion: 'Update pool with latest pack v{version}',
   xosanDelete: 'Delete XOSAN',
   xosanFixIssue: 'Fix',
   xosanCreatingOn: 'Creating XOSAN on {pool}',
@@ -1819,8 +1810,12 @@ const messages = {
   xosanRegister: 'Register your appliance first',
   xosanLoading: 'Loading…',
   xosanNotAvailable: 'XOSAN is not available at the moment',
+  xosanInstallPackOnHosts: 'Install XOSAN pack on these hosts:',
+  xosanInstallPack: 'Install {pack} v{version}?',
   xosanNoPackFound:
     'No compatible XOSAN pack found for your XenServer versions.',
+  xosanPackRequirements:
+    'At least one of these version requirements must be satisfied by all the hosts in this pool:',
   // SR tab XOSAN
   xosanVmsNotRunning: 'Some XOSAN Virtual Machines are not running',
   xosanVmsNotFound: 'Some XOSAN Virtual Machines could not be found',

packages/xo-web/src/common/utils.js

@@ -20,7 +20,6 @@ import {
   mapValues,
   replace,
   sample,
-  some,
   startsWith,
 } from 'lodash'
 
@@ -29,7 +28,6 @@ import * as actions from './store/actions'
 import invoke from './invoke'
 import store from './store'
 import { getObject } from './selectors'
-import { satisfies as versionSatisfies } from 'semver'
 
 export const EMPTY_ARRAY = Object.freeze([])
 export const EMPTY_OBJECT = Object.freeze({})
@@ -525,40 +523,6 @@ export const ShortDate = ({ timestamp }) => (
   <FormattedDate value={timestamp} month='short' day='numeric' year='numeric' />
 )
 
-export const findLatestPack = (packs, hostsVersions) => {
-  const checkVersion = version =>
-    !version ||
-    every(hostsVersions, hostVersion => versionSatisfies(hostVersion, version))
-
-  let latestPack = { version: '0' }
-  forEach(packs, pack => {
-    if (
-      pack.type === 'iso' &&
-      compareVersions(pack.version, '>', latestPack.version) &&
-      checkVersion(pack.requirements && pack.requirements.xenserver)
-    ) {
-      latestPack = pack
-    }
-  })
-
-  if (latestPack.version === '0') {
-    // No compatible pack was found
-    return
-  }
-
-  return latestPack
-}
-
-export const isLatestXosanPackInstalled = (latestXosanPack, hosts) =>
-  latestXosanPack !== undefined &&
-  every(hosts, host =>
-    some(
-      host.supplementalPacks,
-      ({ name, version }) =>
-        name === 'XOSAN' && version === latestXosanPack.version
-    )
-  )
-
 // ===================================================================
 
 export const getMemoryUsedMetric = ({ memory, memoryFree = memory }) =>

packages/xo-web/src/common/xo/index.js

@@ -2412,6 +2412,20 @@ export const removeXosanBricks = (xosansr, bricks) =>
 export const computeXosanPossibleOptions = (lvmSrs, brickSize) =>
   _call('xosan.computeXosanPossibleOptions', { lvmSrs, brickSize })
 
+import InstallXosanPackModal from './install-xosan-pack-modal' // eslint-disable-line import/first
+export const downloadAndInstallXosanPack = pool =>
+  confirm({
+    title: _('xosanInstallPackTitle', { pool: pool.name_label }),
+    icon: 'export',
+    body: <InstallXosanPackModal pool={pool} />,
+  }).then(pack =>
+    _call('xosan.downloadAndInstallXosanPack', {
+      id: pack.id,
+      version: pack.version,
+      pool: resolveId(pool),
+    })
+  )
+
 export const registerXosan = () =>
   _call('cloud.registerResource', { namespace: 'xosan' })::tap(
     subscribeResourceCatalog.forceRefresh
@@ -2420,31 +2434,6 @@ export const registerXosan = () =>
 export const fixHostNotInXosanNetwork = (xosanSr, host) =>
   _call('xosan.fixHostNotInNetwork', { xosanSr, host })
 
-// XOSAN packs -----------------------------------------------------------------
-
-export const getResourceCatalog = () => _call('cloud.getResourceCatalog')
-
-const downloadAndInstallXosanPack = (pack, pool, { version }) =>
-  _call('xosan.downloadAndInstallXosanPack', {
-    id: resolveId(pack),
-    version,
-    pool: resolveId(pool),
-  })
-
-import UpdateXosanPacksModal from './update-xosan-packs-modal' // eslint-disable-line import/first
-export const updateXosanPacks = pool =>
-  confirm({
-    title: _('xosanUpdatePacks'),
-    icon: 'host-patch-update',
-    body: <UpdateXosanPacksModal pool={pool} />,
-  }).then(pack => {
-    if (pack === undefined) {
-      return
-    }
-
-    return downloadAndInstallXosanPack(pack, pool, { version: pack.version })
-  })
-
 // Licenses --------------------------------------------------------------------
 
 export const getLicenses = productId => _call('xoa.getLicenses', { productId })

packages/xo-web/src/common/xo/install-xosan-pack-modal/index.js

@@ -0,0 +1,130 @@
+import _ from 'intl'
+import Component from 'base-component'
+import React from 'react'
+import { connectStore, compareVersions, isXosanPack } from 'utils'
+import { subscribeResourceCatalog, subscribePlugins } from 'xo'
+import {
+  createGetObjectsOfType,
+  createSelector,
+  createCollectionWrapper,
+} from 'selectors'
+import { satisfies as versionSatisfies } from 'semver'
+import { every, filter, forEach, map, some } from 'lodash'
+
+const findLatestPack = (packs, hostsVersions) => {
+  const checkVersion = version =>
+    every(hostsVersions, hostVersion => versionSatisfies(hostVersion, version))
+
+  let latestPack = { version: '0' }
+  forEach(packs, pack => {
+    const xsVersionRequirement =
+      pack.requirements && pack.requirements.xenserver
+
+    if (
+      pack.type === 'iso' &&
+      compareVersions(pack.version, latestPack.version) > 0 &&
+      (!xsVersionRequirement || checkVersion(xsVersionRequirement))
+    ) {
+      latestPack = pack
+    }
+  })
+
+  if (latestPack.version === '0') {
+    // No compatible pack was found
+    return
+  }
+
+  return latestPack
+}
+
+@connectStore(
+  () => ({
+    hosts: createGetObjectsOfType('host').filter(
+      createSelector(
+        (_, { pool }) => pool != null && pool.id,
+        poolId =>
+          poolId
+            ? host =>
+              host.$pool === poolId &&
+                !some(host.supplementalPacks, isXosanPack)
+            : false
+      )
+    ),
+  }),
+  { withRef: true }
+)
+export default class InstallXosanPackModal extends Component {
+  componentDidMount () {
+    this._unsubscribePlugins = subscribePlugins(plugins =>
+      this.setState({ plugins })
+    )
+    this._unsubscribeResourceCatalog = subscribeResourceCatalog(catalog =>
+      this.setState({ catalog })
+    )
+  }
+
+  componentWillUnmount () {
+    this._unsubscribePlugins()
+    this._unsubscribeResourceCatalog()
+  }
+
+  _getXosanLatestPack = createSelector(
+    () => this.state.catalog && this.state.catalog.xosan,
+    createSelector(
+      () => this.props.hosts,
+      createCollectionWrapper(hosts => map(hosts, 'version'))
+    ),
+    findLatestPack
+  )
+
+  _getXosanPacks = createSelector(
+    () => this.state.catalog && this.state.catalog.xosan,
+    packs => filter(packs, ({ type }) => type === 'iso')
+  )
+
+  get value () {
+    return this._getXosanLatestPack()
+  }
+
+  render () {
+    const { hosts } = this.props
+    const latestPack = this._getXosanLatestPack()
+
+    return (
+      <div>
+        {latestPack ? (
+          <div>
+            {_('xosanInstallPackOnHosts')}
+            <ul>
+              {map(hosts, host => <li key={host.id}>{host.name_label}</li>)}
+            </ul>
+            <div className='mt-1'>
+              {_('xosanInstallPack', {
+                pack: latestPack.name,
+                version: latestPack.version,
+              })}
+            </div>
+          </div>
+        ) : (
+          <div>
+            {_('xosanNoPackFound')}
+            <br />
+            {_('xosanPackRequirements')}
+            <ul>
+              {map(this._getXosanPacks(), ({ name, requirements }, key) => (
+                <li key={key}>
+                  {_.keyValue(
+                    name,
+                    requirements && requirements.xenserver
+                      ? requirements.xenserver
+                      : '/'
+                  )}
+                </li>
+              ))}
+            </ul>
+          </div>
+        )}
+      </div>
+    )
+  }
+}

packages/xo-web/src/common/xo/update-xosan-packs-modal/index.js

@@ -1,83 +0,0 @@
-import _ from 'intl'
-import React from 'react'
-import Component from 'base-component'
-import { createGetObjectsOfType, createSelector } from 'selectors'
-import { map } from 'lodash'
-import { subscribeResourceCatalog } from 'xo'
-import { isLatestXosanPackInstalled, connectStore, findLatestPack } from 'utils'
-
-@connectStore(
-  {
-    hosts: createGetObjectsOfType('host').filter((_, { pool }) => host =>
-      host.$pool === pool.id
-    ),
-  },
-  { withRef: true }
-)
-export default class UpdateXosanPacksModal extends Component {
-  componentDidMount () {
-    this.componentWillUnmount = subscribeResourceCatalog(catalog =>
-      this.setState({ catalog })
-    )
-  }
-
-  get value () {
-    return this._getStatus().pack
-  }
-
-  _getStatus = createSelector(
-    () => this.state.catalog,
-    () => this.props.hosts,
-    (catalog, hosts) => {
-      if (catalog === undefined) {
-        return { status: 'error' }
-      }
-
-      if (catalog._namespaces.xosan === undefined) {
-        return { status: 'unavailable' }
-      }
-
-      if (!catalog._namespaces.xosan.registered) {
-        return { status: 'unregistered' }
-      }
-
-      const pack = findLatestPack(catalog.xosan, map(hosts, 'version'))
-
-      if (pack === undefined) {
-        return { status: 'noPack' }
-      }
-
-      if (isLatestXosanPackInstalled(pack, hosts)) {
-        return { status: 'upToDate' }
-      }
-
-      return { status: 'packFound', pack }
-    }
-  )
-
-  render () {
-    const { status, pack } = this._getStatus()
-    switch (status) {
-      case 'checking':
-        return <em>{_('xosanPackUpdateChecking')}</em>
-      case 'error':
-        return <em>{_('xosanPackUpdateError')}</em>
-      case 'unavailable':
-        return <em>{_('xosanPackUpdateUnavailable')}</em>
-      case 'unregistered':
-        return <em>{_('xosanPackUpdateUnregistered')}</em>
-      case 'noPack':
-        return <em>{_('xosanNoPackFound')}</em>
-      case 'upToDate':
-        return <em>{_('xosanPackUpdateUpToDate')}</em>
-      case 'packFound':
-        return (
-          <div>
-            {_('xosanPackUpdateVersion', {
-              version: pack.version,
-            })}
-          </div>
-        )
-    }
-  }
-}

packages/xo-web/src/xo-app/host/tab-advanced.js

@@ -1,11 +1,10 @@
 import _ from 'intl'
-import Component from 'base-component'
 import Copiable from 'copiable'
 import React from 'react'
 import TabButton from 'tab-button'
 import SelectFiles from 'select-files'
 import Upgrade from 'xoa-upgrade'
-import { compareVersions, connectStore } from 'utils'
+import { connectStore } from 'utils'
 import { Toggle } from 'form'
 import {
   enableHost,
@@ -18,7 +17,7 @@ import {
 import { FormattedRelative, FormattedTime } from 'react-intl'
 import { Container, Row, Col } from 'grid'
 import { createGetObjectsOfType, createSelector } from 'selectors'
-import { forEach, map, noop } from 'lodash'
+import { map, noop } from 'lodash'
 
 const ALLOW_INSTALL_SUPP_PACK = process.env.XOA_PLAN > 1
 
@@ -32,9 +31,7 @@ const formatPack = ({ name, author, description, version }, key) => (
   </tr>
 )
 
-const getPackId = ({ author, name }) => `${author}\0${name}`
-
-@connectStore(() => {
+export default connectStore(() => {
   const getPgpus = createGetObjectsOfType('PGPU')
     .pick((_, { host }) => host.$PGPUs)
     .sort()
@@ -47,233 +44,207 @@ const getPackId = ({ author, name }) => `${author}\0${name}`
     pcis: getPcis,
     pgpus: getPgpus,
   }
-})
-export default class extends Component {
-  _getPacks = createSelector(
-    () => this.props.host.supplementalPacks,
-    packs => {
-      const uniqPacks = {}
-      let packId, previousPack
-      forEach(packs, pack => {
-        packId = getPackId(pack)
-        if (
-          (previousPack = uniqPacks[packId]) === undefined ||
-          compareVersions(pack.version, previousPack.version) > 0
-        ) {
-          uniqPacks[packId] = pack
-        }
-      })
-      return uniqPacks
-    }
-  )
-
-  render () {
-    const { host, pcis, pgpus } = this.props
-    return (
-      <Container>
-        <Row>
-          <Col className='text-xs-right'>
-            {host.power_state === 'Running' && (
-              <TabButton
-                btnStyle='warning'
-                handler={forceReboot}
-                handlerParam={host}
-                icon='host-force-reboot'
-                labelId='forceRebootHostLabel'
-              />
+})(({ host, pcis, pgpus }) => (
+  <Container>
+    <Row>
+      <Col className='text-xs-right'>
+        {host.power_state === 'Running' && (
+          <TabButton
+            btnStyle='warning'
+            handler={forceReboot}
+            handlerParam={host}
+            icon='host-force-reboot'
+            labelId='forceRebootHostLabel'
+          />
+        )}
+        {host.enabled ? (
+          <TabButton
+            btnStyle='warning'
+            handler={disableHost}
+            handlerParam={host}
+            icon='host-disable'
+            labelId='disableHostLabel'
+          />
+        ) : (
+          <TabButton
+            btnStyle='success'
+            handler={enableHost}
+            handlerParam={host}
+            icon='host-enable'
+            labelId='enableHostLabel'
+          />
+        )}
+        <TabButton
+          btnStyle='danger'
+          handler={detachHost}
+          handlerParam={host}
+          icon='host-eject'
+          labelId='detachHost'
+        />
+        {host.power_state !== 'Running' && (
+          <TabButton
+            btnStyle='danger'
+            handler={forgetHost}
+            handlerParam={host}
+            icon='host-forget'
+            labelId='forgetHost'
+          />
+        )}
+      </Col>
+    </Row>
+    <Row>
+      <Col>
+        <h3>{_('xenSettingsLabel')}</h3>
+        <table className='table'>
+          <tbody>
+            <tr>
+              <th>{_('uuid')}</th>
+              <Copiable tagName='td'>{host.uuid}</Copiable>
+            </tr>
+            <tr>
+              <th>{_('hostAddress')}</th>
+              <Copiable tagName='td'>{host.address}</Copiable>
+            </tr>
+            <tr>
+              <th>{_('hostStatus')}</th>
+              <td>
+                {host.enabled
+                  ? _('hostStatusEnabled')
+                  : _('hostStatusDisabled')}
+              </td>
+            </tr>
+            <tr>
+              <th>{_('hostPowerOnMode')}</th>
+              <td>
+                <Toggle
+                  disabled
+                  onChange={noop}
+                  value={Boolean(host.powerOnMode)}
+                />
+              </td>
+            </tr>
+            <tr>
+              <th>{_('hostStartedSince')}</th>
+              <td>
+                {_('started', {
+                  ago: <FormattedRelative value={host.startTime * 1000} />,
+                })}
+              </td>
+            </tr>
+            <tr>
+              <th>{_('hostStackStartedSince')}</th>
+              <td>
+                {_('started', {
+                  ago: <FormattedRelative value={host.agentStartTime * 1000} />,
+                })}
+              </td>
+            </tr>
+            <tr>
+              <th>{_('hostXenServerVersion')}</th>
+              <Copiable tagName='td' data={host.version}>
+                {host.license_params.sku_marketing_name} {host.version} ({
+                  host.license_params.sku_type
+                })
+              </Copiable>
+            </tr>
+            <tr>
+              <th>{_('hostBuildNumber')}</th>
+              <Copiable tagName='td'>{host.build}</Copiable>
+            </tr>
+            <tr>
+              <th>{_('hostIscsiName')}</th>
+              <Copiable tagName='td'>{host.iSCSI_name}</Copiable>
+            </tr>
+          </tbody>
+        </table>
+        <br />
+        <h3>{_('hardwareHostSettingsLabel')}</h3>
+        <table className='table'>
+          <tbody>
+            <tr>
+              <th>{_('hostCpusModel')}</th>
+              <Copiable tagName='td'>{host.CPUs.modelname}</Copiable>
+            </tr>
+            <tr>
+              <th>{_('hostGpus')}</th>
+              <td>
+                {map(pgpus, pgpu => pcis[pgpu.pci].device_name).join(', ')}
+              </td>
+            </tr>
+            <tr>
+              <th>{_('hostCpusNumber')}</th>
+              <td>
+                {host.cpus.cores} ({host.cpus.sockets})
+              </td>
+            </tr>
+            <tr>
+              <th>{_('hostManufacturerinfo')}</th>
+              <Copiable tagName='td'>
+                {host.bios_strings['system-manufacturer']} ({
+                  host.bios_strings['system-product-name']
+                })
+              </Copiable>
+            </tr>
+            <tr>
+              <th>{_('hostBiosinfo')}</th>
+              <td>
+                {host.bios_strings['bios-vendor']} ({
+                  host.bios_strings['bios-version']
+                })
+              </td>
+            </tr>
+          </tbody>
+        </table>
+        <br />
+        <h3>{_('licenseHostSettingsLabel')}</h3>
+        <table className='table'>
+          <tbody>
+            <tr>
+              <th>{_('hostLicenseType')}</th>
+              <td>{host.license_params.sku_type}</td>
+            </tr>
+            <tr>
+              <th>{_('hostLicenseSocket')}</th>
+              <td>{host.license_params.sockets}</td>
+            </tr>
+            <tr>
+              <th>{_('hostLicenseExpiry')}</th>
+              <td>
+                <FormattedTime
+                  value={host.license_expiry * 1000}
+                  day='numeric'
+                  month='long'
+                  year='numeric'
+                />
+                <br />
+              </td>
+            </tr>
+          </tbody>
+        </table>
+        <h3>{_('supplementalPacks')}</h3>
+        <table className='table'>
+          <tbody>
+            {map(host.supplementalPacks, formatPack)}
+            {ALLOW_INSTALL_SUPP_PACK && (
+              <tr>
+                <th>{_('supplementalPackNew')}</th>
+                <td>
+                  <SelectFiles
+                    type='file'
+                    onChange={file => installSupplementalPack(host, file)}
+                  />
+                </td>
+              </tr>
             )}
-            {host.enabled ? (
-              <TabButton
-                btnStyle='warning'
-                handler={disableHost}
-                handlerParam={host}
-                icon='host-disable'
-                labelId='disableHostLabel'
-              />
-            ) : (
-              <TabButton
-                btnStyle='success'
-                handler={enableHost}
-                handlerParam={host}
-                icon='host-enable'
-                labelId='enableHostLabel'
-              />
-            )}
-            <TabButton
-              btnStyle='danger'
-              handler={detachHost}
-              handlerParam={host}
-              icon='host-eject'
-              labelId='detachHost'
-            />
-            {host.power_state !== 'Running' && (
-              <TabButton
-                btnStyle='danger'
-                handler={forgetHost}
-                handlerParam={host}
-                icon='host-forget'
-                labelId='forgetHost'
-              />
-            )}
-          </Col>
-        </Row>
-        <Row>
-          <Col>
-            <h3>{_('xenSettingsLabel')}</h3>
-            <table className='table'>
-              <tbody>
-                <tr>
-                  <th>{_('uuid')}</th>
-                  <Copiable tagName='td'>{host.uuid}</Copiable>
-                </tr>
-                <tr>
-                  <th>{_('hostAddress')}</th>
-                  <Copiable tagName='td'>{host.address}</Copiable>
-                </tr>
-                <tr>
-                  <th>{_('hostStatus')}</th>
-                  <td>
-                    {host.enabled
-                      ? _('hostStatusEnabled')
-                      : _('hostStatusDisabled')}
-                  </td>
-                </tr>
-                <tr>
-                  <th>{_('hostPowerOnMode')}</th>
-                  <td>
-                    <Toggle
-                      disabled
-                      onChange={noop}
-                      value={Boolean(host.powerOnMode)}
-                    />
-                  </td>
-                </tr>
-                <tr>
-                  <th>{_('hostStartedSince')}</th>
-                  <td>
-                    {_('started', {
-                      ago: <FormattedRelative value={host.startTime * 1000} />,
-                    })}
-                  </td>
-                </tr>
-                <tr>
-                  <th>{_('hostStackStartedSince')}</th>
-                  <td>
-                    {_('started', {
-                      ago: (
-                        <FormattedRelative value={host.agentStartTime * 1000} />
-                      ),
-                    })}
-                  </td>
-                </tr>
-                <tr>
-                  <th>{_('hostXenServerVersion')}</th>
-                  <Copiable tagName='td' data={host.version}>
-                    {host.license_params.sku_marketing_name} {host.version} ({
-                      host.license_params.sku_type
-                    })
-                  </Copiable>
-                </tr>
-                <tr>
-                  <th>{_('hostBuildNumber')}</th>
-                  <Copiable tagName='td'>{host.build}</Copiable>
-                </tr>
-                <tr>
-                  <th>{_('hostIscsiName')}</th>
-                  <Copiable tagName='td'>{host.iSCSI_name}</Copiable>
-                </tr>
-              </tbody>
-            </table>
-            <br />
-            <h3>{_('hardwareHostSettingsLabel')}</h3>
-            <table className='table'>
-              <tbody>
-                <tr>
-                  <th>{_('hostCpusModel')}</th>
-                  <Copiable tagName='td'>{host.CPUs.modelname}</Copiable>
-                </tr>
-                <tr>
-                  <th>{_('hostGpus')}</th>
-                  <td>
-                    {map(pgpus, pgpu => pcis[pgpu.pci].device_name).join(', ')}
-                  </td>
-                </tr>
-                <tr>
-                  <th>{_('hostCpusNumber')}</th>
-                  <td>
-                    {host.cpus.cores} ({host.cpus.sockets})
-                  </td>
-                </tr>
-                <tr>
-                  <th>{_('hostManufacturerinfo')}</th>
-                  <Copiable tagName='td'>
-                    {host.bios_strings['system-manufacturer']} ({
-                      host.bios_strings['system-product-name']
-                    })
-                  </Copiable>
-                </tr>
-                <tr>
-                  <th>{_('hostBiosinfo')}</th>
-                  <td>
-                    {host.bios_strings['bios-vendor']} ({
-                      host.bios_strings['bios-version']
-                    })
-                  </td>
-                </tr>
-              </tbody>
-            </table>
-            <br />
-            <h3>{_('licenseHostSettingsLabel')}</h3>
-            <table className='table'>
-              <tbody>
-                <tr>
-                  <th>{_('hostLicenseType')}</th>
-                  <td>{host.license_params.sku_type}</td>
-                </tr>
-                <tr>
-                  <th>{_('hostLicenseSocket')}</th>
-                  <td>{host.license_params.sockets}</td>
-                </tr>
-                <tr>
-                  <th>{_('hostLicenseExpiry')}</th>
-                  <td>
-                    <FormattedTime
-                      value={host.license_expiry * 1000}
-                      day='numeric'
-                      month='long'
-                      year='numeric'
-                    />
-                    <br />
-                  </td>
-                </tr>
-              </tbody>
-            </table>
-            <h3>{_('supplementalPacks')}</h3>
-            <table className='table'>
-              <tbody>
-                {map(this._getPacks(), formatPack)}
-                {ALLOW_INSTALL_SUPP_PACK && (
-                  <tr>
-                    <th>{_('supplementalPackNew')}</th>
-                    <td>
-                      <SelectFiles
-                        type='file'
-                        onChange={file => installSupplementalPack(host, file)}
-                      />
-                    </td>
-                  </tr>
-                )}
-              </tbody>
-            </table>
-            {!ALLOW_INSTALL_SUPP_PACK && [
-              <h3>{_('supplementalPackNew')}</h3>,
-              <Container>
-                <Upgrade place='supplementalPacks' available={2} />
-              </Container>,
-            ]}
-          </Col>
-        </Row>
-      </Container>
-    )
-  }
-}
+          </tbody>
+        </table>
+        {!ALLOW_INSTALL_SUPP_PACK && [
+          <h3>{_('supplementalPackNew')}</h3>,
+          <Container>
+            <Upgrade place='supplementalPacks' available={2} />
+          </Container>,
+        ]}
+      </Col>
+    </Row>
+  </Container>
+))

packages/xo-web/src/xo-app/xosan/index.js

@@ -10,13 +10,24 @@ import Tooltip from 'tooltip'
 import { Container, Col, Row } from 'grid'
 import { get } from 'xo-defined'
 import { ignoreErrors } from 'promise-toolbox'
-import { every, filter, find, flatten, forEach, isEmpty, map } from 'lodash'
+import {
+  every,
+  filter,
+  find,
+  flatten,
+  forEach,
+  isEmpty,
+  map,
+  mapValues,
+  some,
+} from 'lodash'
 import { createGetObjectsOfType, createSelector, isAdmin } from 'selectors'
 import {
   addSubscriptions,
   connectStore,
   cowSet,
   formatSize,
+  isXosanPack,
   ShortDate,
 } from 'utils'
 import {
@@ -26,7 +37,6 @@ import {
   subscribePlugins,
   subscribeResourceCatalog,
   subscribeVolumeInfo,
-  updateXosanPacks,
 } from 'xo'
 
 import NewXosan from './new-xosan'
@@ -198,12 +208,6 @@ const XOSAN_COLUMNS = [
 ]
 
 const XOSAN_INDIVIDUAL_ACTIONS = [
-  {
-    handler: (xosan, { pools }) => updateXosanPacks(pools[xosan.$pool]),
-    icon: 'host-patch-update',
-    label: _('xosanUpdatePacks'),
-    level: 'primary',
-  },
   {
     handler: deleteSr,
     icon: 'delete',
@@ -217,6 +221,14 @@ const XOSAN_INDIVIDUAL_ACTIONS = [
   const getHostsByPool = getHosts.groupBy('$pool')
   const getPools = createGetObjectsOfType('pool')
 
+  const noPacksByPool = createSelector(getHostsByPool, hostsByPool =>
+    mapValues(
+      hostsByPool,
+      (poolHosts, poolId) =>
+        !every(poolHosts, host => some(host.supplementalPacks, isXosanPack))
+    )
+  )
+
   const getPbdsBySr = createGetObjectsOfType('PBD').groupBy('SR')
   const getXosanSrs = createSelector(
     createGetObjectsOfType('SR').filter([
@@ -279,6 +291,7 @@ const XOSAN_INDIVIDUAL_ACTIONS = [
     isAdmin,
     isMasterOfflineByPool: getIsMasterOfflineByPool,
     hostsNeedRestartByPool: getHostsNeedRestartByPool,
+    noPacksByPool,
     poolPredicate: getPoolPredicate,
     pools: getPools,
     xoaRegistration: state => state.xoaRegisterState,
@@ -406,8 +419,8 @@ export default class Xosan extends Component {
     const {
       hostsNeedRestartByPool,
       isAdmin,
+      noPacksByPool,
       poolPredicate,
-      pools,
       xoaRegistration,
       xosanSrs,
     } = this.props
@@ -443,6 +456,7 @@ export default class Xosan extends Component {
                       (this._isXosanRegistered() ? (
                         <NewXosan
                           hostsNeedRestartByPool={hostsNeedRestartByPool}
+                          noPacksByPool={noPacksByPool}
                           poolPredicate={poolPredicate}
                           onSrCreationFinished={this._updateLicenses}
                           onSrCreationStarted={this._onSrCreationStarted}
@@ -484,7 +498,6 @@ export default class Xosan extends Component {
                           isAdmin,
                           licensesByXosan: this._getLicensesByXosan(),
                           licenseError,
-                          pools,
                           status: this.state.status,
                         }}
                       />

packages/xo-web/src/xo-app/xosan/new-xosan.js

@@ -29,18 +29,15 @@ import {
 } from 'selectors'
 import {
   addSubscriptions,
-  isLatestXosanPackInstalled,
   compareVersions,
   connectStore,
-  findLatestPack,
   formatSize,
   mapPlus,
 } from 'utils'
 import {
   computeXosanPossibleOptions,
   createXosanSR,
-  updateXosanPacks,
-  getResourceCatalog,
+  downloadAndInstallXosanPack,
   restartHostsAgents,
   subscribeResourceCatalog,
 } from 'xo'
@@ -79,47 +76,14 @@ export default class NewXosan extends Component {
     suggestion: 0,
   }
 
-  _checkPacks = pool =>
-    getResourceCatalog().then(
-      catalog => {
-        if (catalog === undefined || catalog.xosan === undefined) {
-          this.setState({
-            checkPackError: true,
-          })
-          return
-        }
-
-        const hosts = filter(this.props.hosts, { $pool: pool.id })
-        const pack = findLatestPack(catalog.xosan, map(hosts, 'version'))
-
-        if (!isLatestXosanPackInstalled(pack, hosts)) {
-          this.setState({
-            needsUpdate: true,
-          })
-        }
-      },
-      () => {
-        this.setState({
-          checkPackError: true,
-        })
-      }
-    )
-
-  _updateXosanPacks = pool =>
-    updateXosanPacks(pool).then(() => this._checkPacks(pool))
-
   _selectPool = pool => {
     this.setState({
+      selectedSrs: {},
       brickSize: DEFAULT_BRICKSIZE,
-      checkPackError: false,
       memorySize: DEFAULT_MEMORY,
-      needsUpdate: false,
       pif: undefined,
       pool,
-      selectedSrs: {},
     })
-
-    return this._checkPacks(pool)
   }
 
   componentDidUpdate () {
@@ -279,12 +243,10 @@ export default class NewXosan extends Component {
 
     const {
       brickSize,
-      checkPackError,
       customBrickSize,
       customIpRange,
       ipRange,
       memorySize,
-      needsUpdate,
       pif,
       pool,
       selectedSrs,
@@ -294,7 +256,12 @@ export default class NewXosan extends Component {
       vlan,
     } = this.state
 
-    const { hostsNeedRestartByPool, poolPredicate, notRegistered } = this.props
+    const {
+      hostsNeedRestartByPool,
+      noPacksByPool,
+      poolPredicate,
+      notRegistered,
+    } = this.props
 
     if (notRegistered) {
       return (
@@ -329,7 +296,9 @@ export default class NewXosan extends Component {
           <Col size={4}>
             <SelectPif
               disabled={
-                pool == null || needsUpdate || !isEmpty(hostsNeedRestart)
+                pool == null ||
+                noPacksByPool[pool.id] ||
+                !isEmpty(hostsNeedRestart)
               }
               onChange={this.linkState('pif')}
               predicate={this._getPifPredicate()}
@@ -338,273 +307,261 @@ export default class NewXosan extends Component {
           </Col>
         </Row>
         {pool != null &&
-          (checkPackError ? (
-            <em>{_('xosanPackUpdateError')}</em>
-          ) : needsUpdate ? (
+          noPacksByPool[pool.id] && (
             <Row>
-              <Col>
-                <Icon icon='error' /> {_('xosanNeedPack')}
-                <br />
-                <ActionButton
-                  btnStyle='success'
-                  handler={this._updateXosanPacks}
-                  handlerParam={pool}
-                  icon='export'
-                >
-                  {_('xosanInstallIt')}
-                </ActionButton>
-              </Col>
+              <Icon icon='error' /> {_('xosanNeedPack')}
+              <br />
+              <ActionButton
+                btnStyle='success'
+                handler={downloadAndInstallXosanPack}
+                handlerParam={pool}
+                icon='export'
+              >
+                {_('xosanInstallIt')}
+              </ActionButton>
             </Row>
-          ) : !isEmpty(hostsNeedRestart) ? (
+          )}
+        {!isEmpty(hostsNeedRestart) && (
+          <Row>
+            <Icon icon='error' /> {_('xosanNeedRestart')}
+            <br />
+            <ActionButton
+              btnStyle='success'
+              handler={restartHostsAgents}
+              handlerParam={hostsNeedRestart}
+              icon='host-restart-agent'
+            >
+              {_('xosanRestartAgents')}
+            </ActionButton>
+          </Row>
+        )}
+        {pool != null &&
+          !noPacksByPool[pool.id] &&
+          isEmpty(hostsNeedRestart) && [
             <Row>
-              <Col>
-                <Icon icon='error' /> {_('xosanNeedRestart')}
-                <br />
-                <ActionButton
-                  btnStyle='success'
-                  handler={restartHostsAgents}
-                  handlerParam={hostsNeedRestart}
-                  icon='host-restart-agent'
-                >
-                  {_('xosanRestartAgents')}
-                </ActionButton>
-              </Col>
-            </Row>
-          ) : (
-            [
-              <Row>
-                <Col>
-                  <em>{_('xosanSelect2Srs')}</em>
+              <em>{_('xosanSelect2Srs')}</em>
+              <table className='table table-striped'>
+                <thead>
+                  <tr>
+                    <th />
+                    <th>{_('xosanName')}</th>
+                    <th>{_('xosanHost')}</th>
+                    <th>{_('xosanSize')}</th>
+                    <th>{_('xosanUsedSpace')}</th>
+                  </tr>
+                </thead>
+                <tbody>
+                  {map(lvmsrs, sr => {
+                    const host = find(hosts, ['id', sr.$container])
+
+                    return (
+                      <tr key={sr.id}>
+                        <td>
+                          <input
+                            checked={selectedSrs[sr.id] || false}
+                            disabled={disableSrCheckbox(sr)}
+                            onChange={event => this._selectSr(event, sr)}
+                            type='checkbox'
+                          />
+                        </td>
+                        <td>
+                          <Link to={`/srs/${sr.id}/general`}>
+                            {sr.name_label}
+                          </Link>
+                        </td>
+                        <td>
+                          <Link to={`/hosts/${host.id}/general`}>
+                            {host.name_label}
+                          </Link>
+                        </td>
+                        <td>{formatSize(sr.size)}</td>
+                        <td>
+                          {sr.size > 0 && (
+                            <Tooltip
+                              content={_('spaceLeftTooltip', {
+                                used: String(
+                                  Math.round(sr.physical_usage / sr.size * 100)
+                                ),
+                                free: formatSize(sr.size - sr.physical_usage),
+                              })}
+                            >
+                              <progress
+                                className='progress'
+                                max='100'
+                                value={sr.physical_usage / sr.size * 100}
+                              />
+                            </Tooltip>
+                          )}
+                        </td>
+                      </tr>
+                    )
+                  })}
+                </tbody>
+              </table>
+            </Row>,
+            <Row>
+              {!isEmpty(suggestions) && (
+                <div>
+                  <h3>{_('xosanSuggestions')}</h3>
                   <table className='table table-striped'>
                     <thead>
                       <tr>
                         <th />
-                        <th>{_('xosanName')}</th>
-                        <th>{_('xosanHost')}</th>
-                        <th>{_('xosanSize')}</th>
-                        <th>{_('xosanUsedSpace')}</th>
+                        <th>{_('xosanLayout')}</th>
+                        <th>{_('xosanRedundancy')}</th>
+                        <th>{_('xosanCapacity')}</th>
+                        <th>{_('xosanAvailableSpace')}</th>
                       </tr>
                     </thead>
                     <tbody>
-                      {map(lvmsrs, sr => {
-                        const host = find(hosts, ['id', sr.$container])
-
-                        return (
-                          <tr key={sr.id}>
+                      {map(
+                        suggestions,
+                        (
+                          { layout, redundancy, capacity, availableSpace },
+                          index
+                        ) => (
+                          <tr key={index}>
                             <td>
                               <input
-                                checked={selectedSrs[sr.id] || false}
-                                disabled={disableSrCheckbox(sr)}
-                                onChange={event => this._selectSr(event, sr)}
-                                type='checkbox'
+                                checked={+suggestion === index}
+                                name={`suggestion_${pool.id}`}
+                                onChange={this.linkState('suggestion')}
+                                type='radio'
+                                value={index}
                               />
                             </td>
+                            <td>{layout}</td>
+                            <td>{redundancy}</td>
+                            <td>{capacity}</td>
                             <td>
-                              <Link to={`/srs/${sr.id}/general`}>
-                                {sr.name_label}
-                              </Link>
-                            </td>
-                            <td>
-                              <Link to={`/hosts/${host.id}/general`}>
-                                {host.name_label}
-                              </Link>
-                            </td>
-                            <td>{formatSize(sr.size)}</td>
-                            <td>
-                              {sr.size > 0 && (
-                                <Tooltip
-                                  content={_('spaceLeftTooltip', {
-                                    used: String(
-                                      Math.round(
-                                        sr.physical_usage / sr.size * 100
-                                      )
-                                    ),
-                                    free: formatSize(
-                                      sr.size - sr.physical_usage
-                                    ),
-                                  })}
-                                >
-                                  <progress
-                                    className='progress'
-                                    max='100'
-                                    value={sr.physical_usage / sr.size * 100}
-                                  />
-                                </Tooltip>
+                              {availableSpace === 0 ? (
+                                <strong className='text-danger'>0</strong>
+                              ) : (
+                                formatSize(availableSpace)
                               )}
                             </td>
                           </tr>
                         )
-                      })}
+                      )}
                     </tbody>
                   </table>
-                </Col>
-              </Row>,
-              <Row>
-                <Col>
-                  {!isEmpty(suggestions) && (
-                    <div>
-                      <h3>{_('xosanSuggestions')}</h3>
-                      <table className='table table-striped'>
-                        <thead>
-                          <tr>
-                            <th />
-                            <th>{_('xosanLayout')}</th>
-                            <th>{_('xosanRedundancy')}</th>
-                            <th>{_('xosanCapacity')}</th>
-                            <th>{_('xosanAvailableSpace')}</th>
-                          </tr>
-                        </thead>
-                        <tbody>
-                          {map(
-                            suggestions,
-                            (
-                              { layout, redundancy, capacity, availableSpace },
-                              index
-                            ) => (
-                              <tr key={index}>
-                                <td>
-                                  <input
-                                    checked={+suggestion === index}
-                                    name={`suggestion_${pool.id}`}
-                                    onChange={this.linkState('suggestion')}
-                                    type='radio'
-                                    value={index}
-                                  />
-                                </td>
-                                <td>{layout}</td>
-                                <td>{redundancy}</td>
-                                <td>{capacity}</td>
-                                <td>
-                                  {availableSpace === 0 ? (
-                                    <strong className='text-danger'>0</strong>
-                                  ) : (
-                                    formatSize(availableSpace)
-                                  )}
-                                </td>
-                              </tr>
-                            )
-                          )}
-                        </tbody>
-                      </table>
-                      {architecture.layout === 'disperse' && (
-                        <div className='alert alert-danger'>
-                          {_('xosanDisperseWarning', {
-                            link: (
-                              <a href='https://xen-orchestra.com/docs/xosan_types.html'>
-                                xen-orchestra.com/docs/xosan_types.html
-                              </a>
-                            ),
-                          })}
-                        </div>
-                      )}
-                      <Graph
-                        height={160}
-                        layout={architecture.layout}
-                        nSrs={this._getNSelectedSrs()}
-                        redundancy={architecture.redundancy}
-                        width={600}
-                      />
-                      <hr />
-                      <Toggle
-                        onChange={this.toggleState('showAdvanced')}
-                        value={this.state.showAdvanced}
-                      />{' '}
-                      {_('xosanAdvanced')}{' '}
-                      {this.state.showAdvanced && (
-                        <Container className='mb-1'>
-                          <SingleLineRow>
-                            <Col>{_('xosanVlan')}</Col>
-                          </SingleLineRow>
-                          <SingleLineRow>
-                            <Col size={1}>
-                              <Toggle
-                                onChange={this.linkState('useVlan')}
-                                value={useVlan}
-                              />
-                            </Col>
-                            <Col size={3}>
-                              <input
-                                className='form-control'
-                                disabled={!useVlan}
-                                onChange={this.linkState('vlan')}
-                                placeholder='VLAN'
-                                type='text'
-                                value={vlan}
-                              />
-                            </Col>
-                          </SingleLineRow>
-                          <SingleLineRow>
-                            <Col>{_('xosanCustomIpNetwork')}</Col>
-                          </SingleLineRow>
-                          <SingleLineRow>
-                            <Col size={1}>
-                              <Toggle
-                                onChange={this.linkState('customIpRange')}
-                                value={customIpRange}
-                              />
-                            </Col>
-                            <Col size={3}>
-                              <input
-                                className='form-control'
-                                disabled={!customIpRange}
-                                onChange={this.linkState('ipRange')}
-                                placeholder='ipRange'
-                                type='text'
-                                value={ipRange}
-                              />
-                            </Col>
-                          </SingleLineRow>
-                          <SingleLineRow>
-                            <Col>{_('xosanBrickSize')}</Col>
-                          </SingleLineRow>
-                          <SingleLineRow>
-                            <Col size={1}>
-                              <Toggle
-                                className='mr-1'
-                                onChange={this._onCustomBrickSizeChange}
-                                value={customBrickSize}
-                              />
-                            </Col>
-                            <Col size={3}>
-                              <SizeInput
-                                readOnly={!customBrickSize}
-                                value={brickSize}
-                                onChange={this._onBrickSizeChange}
-                                required
-                              />
-                            </Col>
-                          </SingleLineRow>
-                          <SingleLineRow>
-                            <Col size={4}>
-                              <label>{_('xosanMemorySize')}</label>
-                              <SizeInput
-                                value={memorySize}
-                                onChange={this.linkState('memorySize')}
-                                required
-                              />
-                            </Col>
-                          </SingleLineRow>
-                        </Container>
-                      )}
-                      <hr />
+                  {architecture.layout === 'disperse' && (
+                    <div className='alert alert-danger'>
+                      {_('xosanDisperseWarning', {
+                        link: (
+                          <a href='https://xen-orchestra.com/docs/xosan_types.html'>
+                            xen-orchestra.com/docs/xosan_types.html
+                          </a>
+                        ),
+                      })}
                     </div>
                   )}
-                </Col>
-              </Row>,
-              <Row>
-                <Col>
-                  <ActionButton
-                    btnStyle='success'
-                    disabled={this._getDisableCreation()}
-                    handler={this._createXosanVm}
-                    icon='add'
-                  >
-                    {_('xosanCreate')}
-                  </ActionButton>
-                </Col>
-              </Row>,
-            ]
-          ))}
+                  <Graph
+                    height={160}
+                    layout={architecture.layout}
+                    nSrs={this._getNSelectedSrs()}
+                    redundancy={architecture.redundancy}
+                    width={600}
+                  />
+                  <hr />
+                  <Toggle
+                    onChange={this.toggleState('showAdvanced')}
+                    value={this.state.showAdvanced}
+                  />{' '}
+                  {_('xosanAdvanced')}{' '}
+                  {this.state.showAdvanced && (
+                    <Container className='mb-1'>
+                      <SingleLineRow>
+                        <Col>{_('xosanVlan')}</Col>
+                      </SingleLineRow>
+                      <SingleLineRow>
+                        <Col size={1}>
+                          <Toggle
+                            onChange={this.linkState('useVlan')}
+                            value={useVlan}
+                          />
+                        </Col>
+                        <Col size={3}>
+                          <input
+                            className='form-control'
+                            disabled={!useVlan}
+                            onChange={this.linkState('vlan')}
+                            placeholder='VLAN'
+                            type='text'
+                            value={vlan}
+                          />
+                        </Col>
+                      </SingleLineRow>
+                      <SingleLineRow>
+                        <Col>{_('xosanCustomIpNetwork')}</Col>
+                      </SingleLineRow>
+                      <SingleLineRow>
+                        <Col size={1}>
+                          <Toggle
+                            onChange={this.linkState('customIpRange')}
+                            value={customIpRange}
+                          />
+                        </Col>
+                        <Col size={3}>
+                          <input
+                            className='form-control'
+                            disabled={!customIpRange}
+                            onChange={this.linkState('ipRange')}
+                            placeholder='ipRange'
+                            type='text'
+                            value={ipRange}
+                          />
+                        </Col>
+                      </SingleLineRow>
+                      <SingleLineRow>
+                        <Col>{_('xosanBrickSize')}</Col>
+                      </SingleLineRow>
+                      <SingleLineRow>
+                        <Col size={1}>
+                          <Toggle
+                            className='mr-1'
+                            onChange={this._onCustomBrickSizeChange}
+                            value={customBrickSize}
+                          />
+                        </Col>
+                        <Col size={3}>
+                          <SizeInput
+                            readOnly={!customBrickSize}
+                            value={brickSize}
+                            onChange={this._onBrickSizeChange}
+                            required
+                          />
+                        </Col>
+                      </SingleLineRow>
+                      <SingleLineRow>
+                        <Col size={4}>
+                          <label>{_('xosanMemorySize')}</label>
+                          <SizeInput
+                            value={memorySize}
+                            onChange={this.linkState('memorySize')}
+                            required
+                          />
+                        </Col>
+                      </SingleLineRow>
+                    </Container>
+                  )}
+                  <hr />
+                </div>
+              )}
+            </Row>,
+            <Row>
+              <Col>
+                <ActionButton
+                  btnStyle='success'
+                  disabled={this._getDisableCreation()}
+                  handler={this._createXosanVm}
+                  icon='add'
+                >
+                  {_('xosanCreate')}
+                </ActionButton>
+              </Col>
+            </Row>,
+          ]}
         <hr />
       </Container>
     )