Skip to content

Commit

Permalink
update axios@1.7.4 and other minor
Browse files Browse the repository at this point in the history
axios@1.7.4 update with a security fix, now requires the URL when using a socket to include the protocol and server name.

For example:

http://unix:SOCKETPATH:http://server/foo/bar

instead of

http://unix:SOCKETPATH:/foo/bar

Due to this change, I have updated my tests, docs, and will bump the major version
  • Loading branch information
jeffbski committed Aug 20, 2024
1 parent a10322f commit 672fd83
Show file tree
Hide file tree
Showing 7 changed files with 119 additions and 145 deletions.
12 changes: 6 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,8 @@ wait-on http-get://localhost:8000/foo && NEXT_CMD # wait for http 2XX GET
wait-on https-get://myserver/foo && NEXT_CMD # wait for https 2XX GET
wait-on tcp:4000 && NEXT_CMD # wait for service to listen on a TCP port
wait-on socket:/path/mysock # wait for service to listen on domain socket
wait-on http://unix:/var/SOCKPATH:/a/foo # wait for http HEAD on domain socket
wait-on http-get://unix:/var/SOCKPATH:/a/foo # wait for http GET on domain socket
wait-on http://unix:/var/SOCKPATH:http://server/a/foo # wait for http HEAD on domain socket
wait-on http-get://unix:/var/SOCKPATH:http://server/a/foo # wait for http GET on domain socket
```

```
Expand Down Expand Up @@ -81,8 +81,8 @@ Description:
tcp: - TCP port is listening. ex: 1.2.3.4:9000 or foo.com:700
socket: - Domain Socket is listening. ex: socket:/path/to/sock
For http over socket, use http://unix:SOCK_PATH:URL_PATH
like http://unix:/path/to/sock:/foo/bar or
http-get://unix:/path/to/sock:/foo/bar
like http://unix:/path/to/sock:http://server/foo/bar or
http-get://unix:/path/to/sock:http://server/foo/bar
Standard Options:
Expand Down Expand Up @@ -163,8 +163,8 @@ var opts = {
'https-get://my.com/cat',
'tcp:foo.com:8000',
'socket:/my/sock',
'http://unix:/my/sock:/my/url',
'http-get://unix:/my/sock:/my/url'
'http://unix:/my/sock:http://server/my/url',
'http-get://unix:/my/sock:http://server/my/url'
],
delay: 1000, // initial delay in ms, default 0
interval: 100, // poll interval in ms, default 250ms
Expand Down
4 changes: 2 additions & 2 deletions bin/usage.txt
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@ Description:
tcp: - TCP port is listening. ex: tcp:1.2.3.4:9000 or tcp:foo.com:700
socket: - Domain Socket is listening. ex: socket:/path/to/sock
For http over socket, use http://unix:SOCK_PATH:URL_PATH
like http://unix:/path/to/sock:/foo/bar or
http-get://unix:/path/to/sock:/foo/bar
like http://unix:/path/to/sock:http://server/foo/bar or
http-get://unix:/path/to/sock:http://server/foo/bar

Standard Options:

Expand Down
2 changes: 1 addition & 1 deletion lib/wait-on.js
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ const fstat = promisify(fs.stat);
const PREFIX_RE = /^((https?-get|https?|tcp|socket|file):)(.+)$/;
const HOST_PORT_RE = /^(([^:]*):)?(\d+)$/;
const HTTP_GET_RE = /^https?-get:/;
const HTTP_UNIX_RE = /^http:\/\/unix:([^:]+):([^:]+)$/;
const HTTP_UNIX_RE = /^http:\/\/unix:([^:]+):(.+)$/;
const TIMEOUT_ERR_MSG = 'Timed out waiting for';

const WAIT_ON_SCHEMA = Joi.object({
Expand Down
Loading

0 comments on commit 672fd83

Please sign in to comment.