Skip to content

Commit

Permalink
API definition fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
hypatia2 committed Aug 18, 2015
1 parent ad27420 commit 29d4292
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 8 deletions.
18 changes: 11 additions & 7 deletions API.md
Original file line number Original file line Diff line number Diff line change
@@ -1,10 +1,14 @@


## FBAPI - Fruho Backend API ## FBAPI - Fruho Backend API


/check-for-updates GET /check-for-updates
/ip GET /ip
/dns-resolve GET /dnscache
... GET /loc
POST /loc
GET /now
GET /welcome





## VPAPI - VPN Provider API ## VPAPI - VPN Provider API
Expand All @@ -13,12 +17,12 @@ This is the API defined and used by the Fruho program to import VPN configuratio


All calls must be HTTPS with username and password passed via Basic Authentication All calls must be HTTPS with username and password passed via Basic Authentication


GET /api/config GET /vpapi/config
Result: config.ovpn with inline CA and optionally KEY and CERT Result: config.ovpn with inline CA and optionally KEY and CERT


GET /api/plans GET /vpapi/plans
Result: JSON plan description with server list Result: JSON plan description with server list


POST /api/cert POST /vpapi/cert
Input: CSR or PUBKEY posted in body request Input: CSR or PUBKEY posted in body request
Result: signed CRT Result: signed CRT
2 changes: 1 addition & 1 deletion fruho/main.tcl
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -783,7 +783,7 @@ proc vpapi-cert-direct {profilename host port urlpath username password} {
} }
<- $cherr { <- $cherr {
set err [<- $cherr] set err [<- $cherr]
puts stderr [log vpapi-config-direct failed with error: $err] puts stderr [log vpapi-cert-direct failed with error: $err]
# will return http response code # will return http response code
set httpcode $err set httpcode $err
# Never call return from select condition # Never call return from select condition
Expand Down

0 comments on commit 29d4292

Please sign in to comment.