Kris Moore
adf6fe6ab7
Accept self-signed certs for wss
2016-01-08 14:16:35 -05:00
Ken Moore
eee477167b
Fix the cert/key paths used for the websocket server.
2016-01-08 14:12:22 -05:00
Ken Moore
e119e6f25a
Merge branch 'master' of github.com:pcbsd/sysadm
2016-01-08 14:02:20 -05:00
Ken Moore
262ddb637d
Commit some more work on on updating the websocket server to use wss.
2016-01-08 14:01:49 -05:00
Kris Moore
c90c47adf6
Add wss to api-test script
2016-01-08 13:54:01 -05:00
Kris Moore
1ceb256922
Add the new listsnap API call
2016-01-08 13:48:51 -05:00
Kris Moore
38321421c4
Tell resty to accept self-signed certs
2016-01-08 12:11:02 -05:00
Ken Moore
ba654808db
Get the TCP server running with SSL encryption all the time now (TLS1.2)
2016-01-08 12:07:17 -05:00
Ken Moore
b2a2342f95
Switch the api-test script to use https and wss for the connections.
2016-01-08 11:59:04 -05:00
Ken Moore
18fa142de2
Merge branch 'master' of github.com:pcbsd/sysadm
2016-01-08 10:34:59 -05:00
Ken Moore
fbbc72c3a4
Commit some more work converting the QTcpServer into an SslServer. The API test will now connect without failures - but it hangs there (no incoming messages detected)
2016-01-08 10:33:01 -05:00
Kris Moore
94f5526003
Show error output when connection fails for websockets
2016-01-07 16:33:37 -05:00
Ken Moore
8abeeac890
Merge branch 'master' of github.com:pcbsd/sysadm
2016-01-07 16:08:11 -05:00
Ken Moore
cce21a7677
Switch the sysadm server over to the secure socket protocols (wss/https)
2016-01-07 16:07:35 -05:00
Kris Moore
dbbef963ed
Merge branch 'master' of https://github.com/pcbsd/sysadm
2016-01-07 15:41:09 -05:00
Kris Moore
aadcc88b4e
Auto-generate SSL certs we can use for REST/WS servers
2016-01-07 15:40:43 -05:00
Ken Moore
54b70be0fa
Merge branch 'master' of github.com:pcbsd/sysadm
2016-01-07 15:15:43 -05:00
Ken Moore
40a7e41213
Fix a bug with event notifications and the new output structure (ensure it sets the output data properly).
2016-01-07 15:14:46 -05:00
dlavigne
25ecc6f813
Add first action for lifepresever class.
2016-01-07 11:43:17 -05:00
Kris Moore
a606d58af3
Update api-test with better formatting, so we can easily send doc
...
requests over to Dru with all the right information
2016-01-07 10:24:09 -05:00
Kris Moore
0694be78bf
Add the new api-test.sh script, along with a javascript websocket
...
tester. Now you can try out API calls on the fly, which are sent
via REST and WebSockets, to verify you get expected results back
on both.
2016-01-06 17:07:30 -05:00
Kris Moore
2bfdc0928b
Fixed up the way REST / HTTP1.1 messages are formatted when passed
...
back to the client. Fixes an issue with bad header formatting, and
changed JSON to be more human-readable.
Also, changed the test script to only display the verbose error
output if it fails, otherwise it'll just return the JSON response
2016-01-05 17:55:22 -05:00
Ken Moore
7ffec5003b
Add PUT REST support, and clean up the bytes calculation for the output JSON data.
2016-01-05 16:20:37 -05:00
Kris Moore
18adf6d486
Use listcron instead of list-cron
2016-01-05 15:59:04 -05:00
Ken Moore
ab92721fce
Merge branch 'master' of github.com:pcbsd/sysadm
2016-01-05 15:55:18 -05:00
Ken Moore
b425c7bb89
Allow "Post" Requests from REST input.
2016-01-05 15:54:55 -05:00
Kris Moore
9b62a01288
Merge branch 'master' of https://github.com/pcbsd/sysadm
2016-01-05 15:54:42 -05:00
Kris Moore
9531f29a84
Change from GET -> POST in the test example
2016-01-05 15:54:22 -05:00
Ken Moore
838a5d9f60
Fix up some REST input parsing.
2016-01-05 15:50:38 -05:00
Ken Moore
35a90406ec
Oops, forgot to comment out the auth user/pass line from the log file (don't need to keep that around).
2016-01-05 15:12:07 -05:00
Ken Moore
858ed83611
Add in the REST authorization protocols so REST communications now get through to the backend systems if valid requests.
2016-01-05 15:11:01 -05:00
Ken Moore
7677ed5f65
Merge branch 'master' of github.com:pcbsd/sysadm
2016-01-05 14:46:39 -05:00
Ken Moore
c08a458127
Quick fix for the unauthorized return value for bad requests.
2016-01-05 14:46:00 -05:00
Kris Moore
32a836824d
Fix REST test script, and add .gitignore for dirty directory
2016-01-05 14:44:46 -05:00
Ken Moore
6e204d19b6
Merge branch 'master' of github.com:pcbsd/sysadm
2016-01-05 14:18:41 -05:00
Ken Moore
a1ba1044ee
Don't 'close' a socket after a TCP reply - instead just disconnect from the host after all data has been transmitted.
2016-01-05 14:17:46 -05:00
Kris Moore
80c649da4f
Add a tests/ directory, with some basic REST testing utilities
2016-01-05 14:11:28 -05:00
Ken Moore
a5fcddcbbe
Separate out the reply systems within the websocket.[cpp/h] files, and ensure that we close the TCP socket after sending back a reply.
2016-01-05 13:46:55 -05:00
Kris Moore
ad8d88fc7c
Fix a bug parsing the rest URI
2016-01-05 13:35:00 -05:00
Kris Moore
ea0bbad1f6
Merge branch 'master' of https://github.com/pcbsd/sysadm
2016-01-05 13:19:16 -05:00
Kris Moore
528c247607
Add LifePreserver API first list-cron call
2016-01-05 13:19:01 -05:00
Ken Moore
adda4e7931
Merge branch 'master' of github.com:pcbsd/sysadm
2016-01-05 13:18:43 -05:00
Ken Moore
1c7dab4ab2
Fix a typo in the signal/slots for a tcp server.
2016-01-05 13:18:20 -05:00
Ken Moore
b1e451b385
Adjust the new sysadm/network function a bit - just add proper error code handling if nothing was performed.
2016-01-04 15:07:53 -05:00
Ken Moore
ace6c2ca4c
Add a new subsystem to sysadm-server: the sysadm-network device information system.
...
To Access:
namespace="sysadm"
name="network"
args={"action" : "list-devices"}
Output arguments structure:
"<device name>" : {
"ipv4" : <value>,
"ipv6" : <value>,
"netmask" : <value>,
"description" : <value>,
"MAC" : <value>,
"status" : <value>,
"is_active" : [true/false],
"is_dhcp" : [true/false],
"is_wireless" : [true/false]
}
2016-01-04 14:29:04 -05:00
Ken Moore
fdf06cac1e
Clean up a bit more of the websocket class.
2016-01-04 13:44:58 -05:00
Ken Moore
7d53e59a1d
Oops, forgot to turn off debug mode before committing.
2016-01-04 13:33:44 -05:00
Ken Moore
8d57413401
A few more updates to the input message parsing systems for the server: Ensure that both the namespace and the name of the input message are passed through to the backend parser/system (if authorized).
2016-01-04 13:30:49 -05:00
Ken Moore
87ab5f2a22
Fix the input argument parsing for sysadm-server.
2016-01-04 13:01:39 -05:00
Ken Moore
467e7d2bbe
Merge branch 'master' of github.com:pcbsd/sysadm
2015-12-30 16:06:39 -05:00