@@ -21,11 +21,10 @@ discard block |
||
| 21 | 21 | /** |
| 22 | 22 | * Open the socket. |
| 23 | 23 | * |
| 24 | - * @param int $timeOut the amount of time to wait before |
|
| 25 | - * giving up on trying to connect |
|
| 26 | 24 | * |
| 27 | 25 | * @throws Exception\ServerSocketException if the socket cannot be opened |
| 28 | 26 | * within timeout |
| 27 | + * @return void |
|
| 29 | 28 | */ |
| 30 | 29 | public function open(); |
| 31 | 30 | |
@@ -45,6 +44,7 @@ discard block |
||
| 45 | 44 | * Close the socket connection. |
| 46 | 45 | * |
| 47 | 46 | * @throws Exception\ServerSocketException if socket is not open |
| 47 | + * @return void |
|
| 48 | 48 | */ |
| 49 | 49 | public function close(); |
| 50 | 50 | } |
@@ -88,6 +88,9 @@ |
||
| 88 | 88 | return false; |
| 89 | 89 | } |
| 90 | 90 | |
| 91 | + /** |
|
| 92 | + * @param string $commonName |
|
| 93 | + */ |
|
| 91 | 94 | public function isDisabled($commonName) |
| 92 | 95 | { |
| 93 | 96 | Utils::validateCommonName($commonName); |
@@ -51,7 +51,7 @@ discard block |
||
| 51 | 51 | // get all configurations |
| 52 | 52 | $service->get( |
| 53 | 53 | '/config/', |
| 54 | - function (Request $request, TokenInfo $tokenInfo) { |
|
| 54 | + function(Request $request, TokenInfo $tokenInfo) { |
|
| 55 | 55 | $userId = $request->getUrl()->getQueryParameter('user_id'); |
| 56 | 56 | if (!is_null($userId)) { |
| 57 | 57 | self::requireScope($tokenInfo, ['config_get', 'config_get_user']); |
@@ -74,7 +74,7 @@ discard block |
||
| 74 | 74 | // get configuration for a particular common_name |
| 75 | 75 | $service->get( |
| 76 | 76 | '/config/:commonName', |
| 77 | - function (Request $request, TokenInfo $tokenInfo, $commonName) { |
|
| 77 | + function(Request $request, TokenInfo $tokenInfo, $commonName) { |
|
| 78 | 78 | self::requireScope($tokenInfo, ['config_get']); |
| 79 | 79 | |
| 80 | 80 | InputValidation::commonName($commonName); |
@@ -91,7 +91,7 @@ discard block |
||
| 91 | 91 | // set configuration for a particular common_name |
| 92 | 92 | $service->put( |
| 93 | 93 | '/config/:commonName', |
| 94 | - function (Request $request, TokenInfo $tokenInfo, $commonName) { |
|
| 94 | + function(Request $request, TokenInfo $tokenInfo, $commonName) { |
|
| 95 | 95 | self::requireScope($tokenInfo, ['config_update']); |
| 96 | 96 | |
| 97 | 97 | // XXX check content type |
@@ -33,7 +33,7 @@ |
||
| 33 | 33 | { |
| 34 | 34 | $service->get( |
| 35 | 35 | '/log/:showDate', |
| 36 | - function (Request $request, TokenInfo $tokenInfo, $showDate) { |
|
| 36 | + function(Request $request, TokenInfo $tokenInfo, $showDate) { |
|
| 37 | 37 | self::requireScope($tokenInfo, 'log_get'); |
| 38 | 38 | |
| 39 | 39 | InputValidation::date($showDate); |
@@ -44,7 +44,7 @@ discard block |
||
| 44 | 44 | { |
| 45 | 45 | $service->get( |
| 46 | 46 | '/openvpn/status', |
| 47 | - function (Request $request, TokenInfo $tokenInfo) { |
|
| 47 | + function(Request $request, TokenInfo $tokenInfo) { |
|
| 48 | 48 | self::requireScope($tokenInfo, 'openvpn_info'); |
| 49 | 49 | |
| 50 | 50 | $response = new JsonResponse(); |
@@ -56,7 +56,7 @@ discard block |
||
| 56 | 56 | |
| 57 | 57 | $service->get( |
| 58 | 58 | '/openvpn/load-stats', |
| 59 | - function (Request $request, TokenInfo $tokenInfo) { |
|
| 59 | + function(Request $request, TokenInfo $tokenInfo) { |
|
| 60 | 60 | self::requireScope($tokenInfo, 'openvpn_info'); |
| 61 | 61 | |
| 62 | 62 | $response = new JsonResponse(); |
@@ -68,7 +68,7 @@ discard block |
||
| 68 | 68 | |
| 69 | 69 | $service->get( |
| 70 | 70 | '/openvpn/version', |
| 71 | - function (Request $request, TokenInfo $tokenInfo) { |
|
| 71 | + function(Request $request, TokenInfo $tokenInfo) { |
|
| 72 | 72 | self::requireScope($tokenInfo, 'openvpn_info'); |
| 73 | 73 | |
| 74 | 74 | $response = new JsonResponse(); |
@@ -80,7 +80,7 @@ discard block |
||
| 80 | 80 | |
| 81 | 81 | $service->post( |
| 82 | 82 | '/openvpn/kill', |
| 83 | - function (Request $request, TokenInfo $tokenInfo) { |
|
| 83 | + function(Request $request, TokenInfo $tokenInfo) { |
|
| 84 | 84 | self::requireScope($tokenInfo, 'openvpn_kill'); |
| 85 | 85 | |
| 86 | 86 | $commonName = $request->getPostParameter('common_name'); |
@@ -43,7 +43,7 @@ |
||
| 43 | 43 | { |
| 44 | 44 | $service->post( |
| 45 | 45 | '/ca/crl/fetch', |
| 46 | - function (Request $request, TokenInfo $tokenInfo) { |
|
| 46 | + function(Request $request, TokenInfo $tokenInfo) { |
|
| 47 | 47 | self::requireScope($tokenInfo, 'ca_crl_fetch'); |
| 48 | 48 | |
| 49 | 49 | $this->logger->info('fetching CRL'); |
@@ -123,7 +123,7 @@ |
||
| 123 | 123 | $config->v('api') |
| 124 | 124 | ), |
| 125 | 125 | ['realm' => 'VPN Server API'] |
| 126 | - ); |
|
| 126 | + ); |
|
| 127 | 127 | |
| 128 | 128 | $authenticationPlugin = new AuthenticationPlugin(); |
| 129 | 129 | $authenticationPlugin->register($apiAuth, 'api'); |
@@ -43,7 +43,7 @@ |
||
| 43 | 43 | { |
| 44 | 44 | $service->post( |
| 45 | 45 | '/ca/crl/fetch', |
| 46 | - function (Request $request, TokenInfo $tokenInfo) { |
|
| 46 | + function(Request $request, TokenInfo $tokenInfo) { |
|
| 47 | 47 | self::requireScope($tokenInfo, 'ca_crl_fetch'); |
| 48 | 48 | |
| 49 | 49 | $this->logger->info('fetching CRL'); |
@@ -27,14 +27,14 @@ |
||
| 27 | 27 | 'cn', |
| 28 | 28 | 'valid_from', |
| 29 | 29 | 'valid_to', |
| 30 | - 'dev', // tun-udp, tun-tcp, tun0, tun1, ... |
|
| 31 | - 'proto', // udp6, tcp-server |
|
| 32 | - 'port', // 1194, 443, ... |
|
| 30 | + 'dev', // tun-udp, tun-tcp, tun0, tun1, ... |
|
| 31 | + 'proto', // udp6, tcp-server |
|
| 32 | + 'port', // 1194, 443, ... |
|
| 33 | 33 | 'v4_network', |
| 34 | 34 | 'v4_netmask', |
| 35 | 35 | 'v6_prefix', |
| 36 | 36 | 'dns', |
| 37 | - 'management_port', // 7505, 7506, ... |
|
| 37 | + 'management_port', // 7505, 7506, ... |
|
| 38 | 38 | 'ca', |
| 39 | 39 | 'cert', |
| 40 | 40 | 'key', |