Skip to content

Fixed hanging on stdin in API mode. #4657

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
stamparm merged 2 commits into from
Oct 8, 2021
Merged

Fixed hanging on stdin in API mode. #4657

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8d6b68d
Fixed hanging on stdin in API mode.
Apr 26, 2021
d98f914
Merge branch 'master' into stdin_fix
stamparm Oct 8, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions lib/parse/cmdline.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1057,10 +1057,12 @@ def _format_action_invocation(self, action):
if args.dummy:
args.url = args.url or DUMMY_URL

if hasattr(sys.stdin, "fileno") and not os.isatty(sys.stdin.fileno()) and '-' not in sys.argv and "GITHUB_ACTIONS" not in os.environ:
args.stdinPipe = iter(sys.stdin.readline, None)
else:
args.stdinPipe = None
args.stdinPipe = None
if hasattr(sys.stdin, "fileno") and not os.isatty(sys.stdin.fileno()) and '-' not in sys.argv:
if args.api:
logger.info("Ignoring STDIN in API mode")
else:
args.stdinPipe = iter(sys.stdin.readline, None)

if not any((args.direct, args.url, args.logFile, args.bulkFile, args.googleDork, args.configFile, args.requestFile, args.updateAll, args.smokeTest, args.vulnTest, args.wizard, args.dependencies, args.purge, args.listTampers, args.hashFile, args.stdinPipe)):
errMsg = "missing a mandatory option (-d, -u, -l, -m, -r, -g, -c, --wizard, --shell, --update, --purge, --list-tampers or --dependencies). "
Expand Down