mirror of
https://github.com/drakkan/sftpgo.git
synced 2025-11-29 22:08:10 +02:00
add SCP support
SCP is an experimental feature, we have our own SCP implementation since we can't rely on scp system command to proper handle permissions, quota and user's home dir restrictions. The SCP protocol is quite simple but there is no official docs about it, so we need more testing and feedbacks before enabling it by default. We may not handle some borderline cases or have sneaky bugs. This commit contains some breaking changes to the REST API. SFTPGo API should be stable now and I hope no more breaking changes before the first stable release.
This commit is contained in:
@@ -154,12 +154,12 @@ Output:
|
||||
]
|
||||
```
|
||||
|
||||
### Get SFTP connections
|
||||
### Get active connections
|
||||
|
||||
Command:
|
||||
|
||||
```
|
||||
python sftpgo_api_cli.py get-sftp-connections
|
||||
python sftpgo_api_cli.py get-connections
|
||||
```
|
||||
|
||||
Output:
|
||||
@@ -173,9 +173,11 @@ Output:
|
||||
"remote_address": "127.0.0.1:41622",
|
||||
"connection_time": 1564696137971,
|
||||
"last_activity": 1564696159605,
|
||||
"protocol": "SFTP",
|
||||
"active_transfers": [
|
||||
{
|
||||
"operation_type": "upload",
|
||||
"path": "/test_upload.gz",
|
||||
"start_time": 1564696149783,
|
||||
"size": 1146880,
|
||||
"last_activity": 1564696159605
|
||||
@@ -185,12 +187,12 @@ Output:
|
||||
]
|
||||
```
|
||||
|
||||
### Close SFTP connection
|
||||
### Close connection
|
||||
|
||||
Command:
|
||||
|
||||
```
|
||||
python sftpgo_api_cli.py close-sftp-connection 76a11b22260ee4249328df28bef34dc64c70f7c097db52159fc24049eeb0e32c
|
||||
python sftpgo_api_cli.py close-connection 76a11b22260ee4249328df28bef34dc64c70f7c097db52159fc24049eeb0e32c
|
||||
```
|
||||
|
||||
Output:
|
||||
|
||||
@@ -22,7 +22,7 @@ class SFTPGoApiRequests:
|
||||
def __init__(self, debug, baseUrl, authType, authUser, authPassword, secure, no_color):
|
||||
self.userPath = urlparse.urljoin(baseUrl, '/api/v1/user')
|
||||
self.quotaScanPath = urlparse.urljoin(baseUrl, '/api/v1/quota_scan')
|
||||
self.activeConnectionsPath = urlparse.urljoin(baseUrl, '/api/v1/sftp_connection')
|
||||
self.activeConnectionsPath = urlparse.urljoin(baseUrl, '/api/v1/connection')
|
||||
self.versionPath = urlparse.urljoin(baseUrl, '/api/v1/version')
|
||||
self.debug = debug
|
||||
if authType == 'basic':
|
||||
@@ -101,12 +101,12 @@ class SFTPGoApiRequests:
|
||||
r = requests.delete(urlparse.urljoin(self.userPath, "user/" + str(user_id)), auth=self.auth, verify=self.verify)
|
||||
self.printResponse(r)
|
||||
|
||||
def getSFTPConnections(self):
|
||||
def getConnections(self):
|
||||
r = requests.get(self.activeConnectionsPath, auth=self.auth, verify=self.verify)
|
||||
self.printResponse(r)
|
||||
|
||||
def closeSFTPConnection(self, connectionID):
|
||||
r = requests.delete(urlparse.urljoin(self.userPath, "sftp_connection/" + str(connectionID)), auth=self.auth)
|
||||
def closeConnection(self, connectionID):
|
||||
r = requests.delete(urlparse.urljoin(self.activeConnectionsPath, "connection/" + str(connectionID)), auth=self.auth)
|
||||
self.printResponse(r)
|
||||
|
||||
def getQuotaScans(self):
|
||||
@@ -187,11 +187,11 @@ if __name__ == '__main__':
|
||||
parserGetUserByID = subparsers.add_parser('get-user-by-id', help='Find user by ID')
|
||||
parserGetUserByID.add_argument('id', type=int)
|
||||
|
||||
parserGetSFTPConnections = subparsers.add_parser('get-sftp-connections',
|
||||
help='Get the active sftp users and info about their uploads/downloads')
|
||||
parserGetConnections = subparsers.add_parser('get-connections',
|
||||
help='Get the active users and info about their uploads/downloads')
|
||||
|
||||
parserCloseSFTPConnection = subparsers.add_parser('close-sftp-connection', help='Terminate an active SFTP connection')
|
||||
parserCloseSFTPConnection.add_argument('connectionID', type=str)
|
||||
parserCloseConnection = subparsers.add_parser('close-connection', help='Terminate an active SFTP/SCP connection')
|
||||
parserCloseConnection.add_argument('connectionID', type=str)
|
||||
|
||||
parserGetQuotaScans = subparsers.add_parser('get-quota-scans', help='Get the active quota scans')
|
||||
|
||||
@@ -219,10 +219,10 @@ if __name__ == '__main__':
|
||||
api.getUsers(args.limit, args.offset, args.order, args.username)
|
||||
elif args.command == 'get-user-by-id':
|
||||
api.getUserByID(args.id)
|
||||
elif args.command == 'get-sftp-connections':
|
||||
api.getSFTPConnections()
|
||||
elif args.command == 'close-sftp-connection':
|
||||
api.closeSFTPConnection(args.connectionID)
|
||||
elif args.command == 'get-connections':
|
||||
api.getConnections()
|
||||
elif args.command == 'close-connection':
|
||||
api.closeConnection(args.connectionID)
|
||||
elif args.command == 'get-quota-scans':
|
||||
api.getQuotaScans()
|
||||
elif args.command == 'start-quota-scan':
|
||||
|
||||
Reference in New Issue
Block a user