parent
808cc5d8d0
commit
220750f887
@ -18,8 +18,12 @@ export const parse = (remote) => {
|
|||||||
remote.share = share
|
remote.share = share
|
||||||
} else if (type === 'smb') {
|
} else if (type === 'smb') {
|
||||||
remote.type = 'smb'
|
remote.type = 'smb'
|
||||||
const [auth, smb] = rest.split('@')
|
const lastArobas = rest.lastIndexOf('@')
|
||||||
const [username, password] = auth.split(':')
|
const smb = rest.slice(lastArobas)
|
||||||
|
const auth = rest.slice(0, lastArobas)
|
||||||
|
const firstColon = auth.indexOf(':')
|
||||||
|
const username = auth.slice(0, firstColon)
|
||||||
|
const password = auth.slice(firstColon)
|
||||||
const [domain, sh] = smb.split('\\\\')
|
const [domain, sh] = smb.split('\\\\')
|
||||||
const [host, path] = sh.split('\0')
|
const [host, path] = sh.split('\0')
|
||||||
remote.host = host
|
remote.host = host
|
||||||
|
@ -24,6 +24,26 @@ const SMB = {
|
|||||||
password: 'password'
|
password: 'password'
|
||||||
}
|
}
|
||||||
|
|
||||||
|
const SMB_AROBAS = {
|
||||||
|
url: 'smb://Administrator:pass@word@toto\\\\192.168.100.225\\smb\0',
|
||||||
|
type: 'smb',
|
||||||
|
host: '192.168.100.225\\smb',
|
||||||
|
path: undefined,
|
||||||
|
domain: 'toto',
|
||||||
|
username: 'Administrator',
|
||||||
|
password: 'pass@word'
|
||||||
|
}
|
||||||
|
|
||||||
|
const SMB_COLON = {
|
||||||
|
url: 'smb://Administrator:pass:word@toto\\\\192.168.100.225\\smb\0',
|
||||||
|
type: 'smb',
|
||||||
|
host: '192.168.100.225\\smb',
|
||||||
|
path: undefined,
|
||||||
|
domain: 'toto',
|
||||||
|
username: 'Administrator',
|
||||||
|
password: 'pass:word'
|
||||||
|
}
|
||||||
|
|
||||||
const parseData = {
|
const parseData = {
|
||||||
file: {
|
file: {
|
||||||
url: 'file://var/lib/xoa/backup', // Remotes formatted before fixing #7 will not break when reparses
|
url: 'file://var/lib/xoa/backup', // Remotes formatted before fixing #7 will not break when reparses
|
||||||
@ -31,7 +51,9 @@ const parseData = {
|
|||||||
path: '/var/lib/xoa/backup'
|
path: '/var/lib/xoa/backup'
|
||||||
},
|
},
|
||||||
fileFixed: FILE_FIXED,
|
fileFixed: FILE_FIXED,
|
||||||
smb: SMB
|
smb: SMB,
|
||||||
|
'smb@inPassword': SMB_AROBAS,
|
||||||
|
'smb:inPassword': SMB_COLON
|
||||||
}
|
}
|
||||||
|
|
||||||
const formatData = {
|
const formatData = {
|
||||||
@ -41,7 +63,9 @@ const formatData = {
|
|||||||
path: '/var/lib/xoa/backup'
|
path: '/var/lib/xoa/backup'
|
||||||
},
|
},
|
||||||
fileFixed: FILE_FIXED,
|
fileFixed: FILE_FIXED,
|
||||||
smb: SMB
|
smb: SMB,
|
||||||
|
'smb@inPassword': SMB_AROBAS,
|
||||||
|
'smb:inPassword': SMB_COLON
|
||||||
}
|
}
|
||||||
|
|
||||||
// -------------------------------------------------------------------
|
// -------------------------------------------------------------------
|
||||||
|
Loading…
Reference in New Issue
Block a user