github-personal/sysadm
1
0
Fork 0
mirror of https://github.com/outbackdingo/sysadm.git synced 2026-01-27 10:20:26 +00:00
Code Issues Packages Projects Releases Wiki Activity
92 Commits 2 Branches 3 Tags
35c090da897b2416fcdafed1ff6e458d4d7180dc
Commit Graph

92 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ken Moore
35c090da89 Merge pull request #1 from ldemouy/master 
Adds in the LookUpPort function call as well as the basic framework for a new sysadm-firewall management class.
 2016-01-11 14:27:45 -05:00
Luke De Mouy
a326c3f811 renamed PortLookUp to firewall, and the files to sysadm-firewall 2016-01-11 12:22:54 -07:00
dlavigne
4595487578 Doc 3 more API actions. 2016-01-11 11:11:11 -05:00
Luke De Mouy
fb508a8352 Move PortInfo struct out of PortLookUp class, and fiddled with the regex 
to make it actually work based on testing. The filter operation now will
pickup things like 522/tcp in the QStringList if you're searching for
22/tcp, but testing seems to indicate that just taking the first one in
the list works for getting what we want.
 2016-01-09 13:00:23 -07:00
Kris Moore
4c562a85b2 Add a new API call to create snapshot schedules for LifePreserver 
REST Request:
-------------------------------
PUT /sysadm/lifepreserver
{
   "pool" : "mytank",
   "keep" : "10",
   "frequency" : "daily@11",
   "action" : "cronsnap"
}

REST Response:
-------------------------------
{
    "args": {
        "cronsnap": {
            "frequency": "daily@11",
            "keep": "10",
            "pool": "mytank"
        }
    }
}

WebSocket Request:
-------------------------------
{
   "args" : {
      "action" : "cronsnap",
      "keep" : "10",
      "frequency" : "daily@11",
      "pool" : "mytank"
   },
   "namespace" : "sysadm",
   "name" : "lifepreserver",
   "id" : "fooid"
}

WebSocket Response:
-------------------------------
{
  "args": {
    "cronsnap": {
      "frequency": "daily@11",
      "keep": "10",
      "pool": "mytank"
    }
  },
  "id": "fooid",
  "name": "response",
  "namespace": "sysadm"
}
 2016-01-08 15:52:09 -05:00
Kris Moore
9160af8912 Add a new API call for sysadm/lifepserver which returns the system-wide 
settings of the utility

REST Request:
-------------------------------
PUT /sysadm/lifepreserver
{
   "action" : "settings"
}

REST Response:
-------------------------------
{
    "args": {
        "settings": {
            "diskwarn": "85%",
            "email": "WARN",
            "emailaddress": "krismoore134@gmail.com",
            "recursive": "ON"
        }
    }
}

WebSocket Request:
-------------------------------
{
   "id" : "fooid",
   "args" : {
      "action" : "settings"
   },
   "namespace" : "sysadm",
   "name" : "lifepreserver"
}

WebSocket Response:
-------------------------------
{
  "args": {
    "settings": {
      "diskwarn": "85%",
      "email": "WARN",
      "emailaddress": "krismoore134@gmail.com",
      "recursive": "ON"
    }
  },
  "id": "fooid",
  "name": "response",
  "namespace": "sysadm"
}
 2016-01-08 14:47:55 -05:00
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
Luke De Mouy
5cc11be9e6 add the port type to the PortInfo struct 2016-01-07 16:55:04 -07:00
Luke De Mouy
26f51d6822 Make portlookup take the port type into consideration when checking the 
port
 2016-01-07 16:42:11 -07: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
Luke De Mouy
bdac469ed3 remove unnecessary <string> include, delete the QFile once we're done 
with it. Add in a constructor that initializes the port cache, and add
in a destructor to delete the cache if portlookup is deleted.
 2016-01-07 03:39:50 -07:00
Luke De Mouy
19c072bc81 update library.pro to build the portlookup class 
Refactor portlookup from a function that reads a file each time it is
called to a class that reads the file into a QStringList the first time
that it is called and reuses it afterwards.
 2016-01-06 18:04:47 -07: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
Luke De Mouy
37c6b2a7c9 Adds in the LookUpPort function call that returns a struct containing 
information about a port including it's description and keyword.
SSH and the web port are current placeholders for the recommended ports list
 2016-01-06 12:59:00 -07: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