troubadix 24.10.0__tar.gz → 24.10.2__tar.gz

{troubadix-24.10.0 → troubadix-24.10.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: troubadix
-Version: 24.10.0
+Version: 24.10.2
 Summary: A linting and QA check tool for NASL files
 Home-page: https://github.com/greenbone/troubadix
 License: GPL-3.0-or-later
@@ -16,6 +16,7 @@ Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
 Classifier: Topic :: Software Development :: Libraries :: Python Modules
 Requires-Dist: chardet (>=4,<6)
 Requires-Dist: charset-normalizer (>=3.2.0,<4.0.0)
@@ -23,7 +24,7 @@ Requires-Dist: codespell (>=2.0.0,<3.0.0)
 Requires-Dist: gitpython (>=3.1.31,<4.0.0)
 Requires-Dist: pontos (>=22.7,<25.0)
 Requires-Dist: python-magic (>=0.4.25,<0.5.0)
-Requires-Dist: validators (==0.20.0)
+Requires-Dist: validators (>=0.34.0,<0.35.0)
 Project-URL: Repository, https://github.com/greenbone/troubadix
 Description-Content-Type: text/markdown
 

{troubadix-24.10.0 → troubadix-24.10.2}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "troubadix"
-version = "24.10.0"
+version = "24.10.2"
 description = "A linting and QA check tool for NASL files"
 authors = ["Greenbone <info@greenbone.net>"]
 license = "GPL-3.0-or-later"
@@ -29,14 +29,14 @@ pontos = ">=22.7,<25.0"
 codespell = "^2.0.0"
 python-magic = "^0.4.25"
 chardet = ">=4,<6"
-validators = "0.20.0"
+validators = "^0.34.0"
 gitpython = "^3.1.31"
 charset-normalizer = "^3.2.0"
 
 [tool.poetry.group.dev.dependencies]
 autohooks = ">=21.7.0"
 autohooks-plugin-black = ">=21.12.0"
-ruff = ">=0.5.6,<0.7.0"
+ruff = ">=0.5.6,<0.8.0"
 autohooks-plugin-ruff = "^24.1.0"
 
 [tool.black]

troubadix-24.10.2/tests/plugins/test_script_xref_url.py

@@ -0,0 +1,206 @@
+# Copyright (C) 2022 Greenbone AG
+#
+# SPDX-License-Identifier: GPL-3.0-or-later
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+from pathlib import Path
+
+from tests.plugins import PluginTestCase
+from troubadix.plugin import LinterError
+from troubadix.plugins.script_xref_url import CheckScriptXrefUrl
+
+
+class CheckScriptXrefUrlTestCase(PluginTestCase):
+    path = Path("some/file.nasl")
+
+    def test_ok(self):
+        content = (
+            '  script_xref(name:"URL", value:"http://www.example.com");\n'
+            # pylint: disable=line-too-long
+            # Various cases from https://github.com/python-validators/validators/issues/296
+            '  script_xref(name:"URL", value:"https://launchpad.support.sap.com/#/notes/2718993");\n'
+            '  script_xref(name:"URL", value:"https://forums.livezilla.net/index.php?/topic/10983-fg-vd-19-086-livezilla-server-is-vulnerable-to-sql-injection-ii/");\n'
+            '  script_xref(name:"URL", value:"http://www.brocade.com/en/backend-content/pdf-page.html?/content/dam/common/documents/content-types/security-bulletin/brocade-security-advisory-2016-168.pdf");\n'
+            '  script_xref(name:"URL", value:"https://groups.google.com/forum/?fromgroups#!topic/rubyonrails-security/8SA-M3as7A8");\n'
+            '  script_xref(name:"URL", value:"https://forum.bitdefender.com/index.php?/topic/75470-doubleagent/");\n'
+            '  script_xref(name:"URL", value:"https://www.smartftp.com/forums/index.php?/topic/16425-smartftp-client-40-change-log/");\n'
+            '  script_xref(name:"URL", value:"https://exchange.xforce.ibmcloud.com/#/vulnerabilities/100912");\n'
+            '  script_xref(name:"URL", value:"https://support.microsoft.com/en-us/lifecycle#gp/Microsoft-Internet-Explorer");\n'
+            '  script_xref(name:"URL", value:"https://www.watchguard.com/support/release-notes/fireware/12/en-US/EN_ReleaseNotes_Fireware_12_5_9/index.html#Fireware/en-US/resolved_issues.html");\n'
+            '  script_xref(name:"URL", value:"https://code.wireshark.org/review/#/c/25660/");\n'
+            '  script_xref(name:"URL", value:"https://groups.google.com/forum/#!topic/kubernetes-announce/yBrFf5nmvfI");\n'
+            '  script_xref(name:"URL", value:"https://issues.sonatype.org/plugins/servlet/mobile#issue/NEXUS-16870");\n'
+            '  script_xref(name:"URL", value:"http://forums.livezilla.net/index.php?/topic/163-livezilla-changelog/");\n'
+            '  script_xref(name:"URL", value:"https://www.watchguard.com/support/release-notes/fireware/11/en-US/EN_ReleaseNotes_Fireware_11_12_1/index.html#Fireware/en-US/resolved_issues.html%3FTocPath%3D_____13");\n'
+            '  script_xref(name:"URL", value:"https://review.typo3.org/#/c/37013");\n'
+            '  script_xref(name:"URL", value:"https://forums.malwarebytes.org/index.php?/topic/158251-malwarebytes-anti-exploit-hall-of-fame/");\n'
+            '  script_xref(name:"URL", value:"http://speedtouch.sourceforge.io/index.php?/news.en.html");\n'
+            '  script_xref(name:"URL", value:"https://support.k7computing.com/index.php?/Knowledgebase/Article/View/173/41/advisory-issued-on-6th-november-2017");\n'
+            '  script_xref(name:"URL", value:"http://support.novell.com/cgi-bin/search/searchtid.cgi?/10077872.htm");\n'
+            '  script_xref(name:"URL", value:"https://blog.fuzzing-project.org/54-Update-on-MatrixSSL-miscalculation-CVE-2016-8671,-incomplete-fix-for-CVE-2016-6887.html");\n'
+            '  script_xref(name:"URL", value:"http://www.scaprepo.com/view.jsp?id=oval:org.secpod.oval:def:701638");\n'
+            '  script_xref(name:"URL", value:"https://blog.fuzzing-project.org/46-Various-invalid-memory-reads-in-ImageMagick-WPG,-DDS,-DCM.html");\n'
+            '  script_xref(name:"URL", value:"http://forum.wampserver.com/read.php?2,153491");\n'
+            '  script_xref(name:"URL", value:"https://secure1.securityspace.com/smysecure/catid.html?in=FreeBSD-SA-10:04.jail.asc");\n'
+            '  script_xref(name:"URL", value:"http://www.corelan.be:8800/index.php/forum/security-advisories/corelan-10-004-turboftp-server-1-00-712-dos/");\n'
+            '  script_xref(name:"URL", value:"http://core.yehg.net/lab/pr0js/advisories/dll_hijacking/[flash_player]_10.1.x_insecure_dll_hijacking_(dwmapi.dll)");\n'
+            '  script_xref(name:"URL", value:"http://mail-archives.apache.org/mod_mbox/perl-advocacy/200904.mbox/<ad28918e0904011458h273a71d4x408f1ed286c9dfbc@mail.gmail.com>");\n'
+            '  script_xref(name:"URL", value:"https://confluence.atlassian.com/security/security-bulletin-may-21-2024-1387867145.html");\n'
+            # pylint: enable=line-too-long
+        )
+        fake_context = self.create_file_plugin_context(
+            nasl_file=self.path, file_content=content
+        )
+        plugin = CheckScriptXrefUrl(fake_context)
+
+        results = list(plugin.run())
+
+        self.assertEqual(len(results), 0)
+
+    def test_exclude_inc_file(self):
+        path = Path("some/file.inc")
+        fake_context = self.create_file_plugin_context(nasl_file=path)
+        plugin = CheckScriptXrefUrl(fake_context)
+
+        results = list(plugin.run())
+
+        self.assertEqual(len(results), 0)
+
+    def test_generic_invalid_url(self):
+        content = '  script_xref(name:"URL", value:"www.example.com");\n'
+        fake_context = self.create_file_plugin_context(
+            nasl_file=self.path, file_content=content
+        )
+        plugin = CheckScriptXrefUrl(fake_context)
+
+        results = list(plugin.run())
+
+        self.assertEqual(len(results), 1)
+        self.assertIsInstance(results[0], LinterError)
+        self.assertEqual(
+            'script_xref(name:"URL", value:"www.example.com");: Invalid URL'
+            " value",
+            results[0].message,
+        )
+
+    def test_invalid_url_trailing_angle_bracket(self):
+        content = '  script_xref(name:"URL", value:"https://docs.docker.com/engine/release-notes/24.0/#2407>");\n'
+        fake_context = self.create_file_plugin_context(
+            nasl_file=self.path, file_content=content
+        )
+        plugin = CheckScriptXrefUrl(fake_context)
+
+        results = list(plugin.run())
+
+        self.assertEqual(len(results), 1)
+        self.assertIsInstance(results[0], LinterError)
+        self.assertEqual(
+            'script_xref(name:"URL", value:"https://docs.docker.com/engine/'
+            'release-notes/24.0/#2407>");: Invalid URL'
+            " value (trailing '>')",
+            results[0].message,
+        )
+
+    def test_invalid_url_trailing_comma(self):
+        content = '  script_xref(name:"URL", value:"https://dev.mysql.com/doc/refman/5.7/en/mysql-stmt-fetch.html,");\n'
+        fake_context = self.create_file_plugin_context(
+            nasl_file=self.path, file_content=content
+        )
+        plugin = CheckScriptXrefUrl(fake_context)
+
+        results = list(plugin.run())
+
+        self.assertEqual(len(results), 1)
+        self.assertIsInstance(results[0], LinterError)
+        self.assertEqual(
+            'script_xref(name:"URL", value:"https://dev.mysql.com/doc/refman/5.7/en/'
+            'mysql-stmt-fetch.html,");: Invalid URL'
+            " value (trailing ',')",
+            results[0].message,
+        )
+
+    def test_invalid_url_trailing_punctuation_mark(self):
+        content = '  script_xref(name:"URL", value:"http://isec.pl/vulnerabilities/isec-0017-binfmt_elf.txt:");\n'
+        fake_context = self.create_file_plugin_context(
+            nasl_file=self.path, file_content=content
+        )
+        plugin = CheckScriptXrefUrl(fake_context)
+
+        results = list(plugin.run())
+
+        self.assertEqual(len(results), 1)
+        self.assertIsInstance(results[0], LinterError)
+        self.assertEqual(
+            'script_xref(name:"URL", value:"http://isec.pl/vulnerabilities/'
+            'isec-0017-binfmt_elf.txt:");: Invalid URL'
+            " value (trailing ':')",
+            results[0].message,
+        )
+
+    def test_invalid_url_trailing_square_bracket(self):
+        content = (
+            '  script_xref(name:"URL", value:"https://example.com/foo/bar]");\n'
+        )
+        fake_context = self.create_file_plugin_context(
+            nasl_file=self.path, file_content=content
+        )
+        plugin = CheckScriptXrefUrl(fake_context)
+
+        results = list(plugin.run())
+
+        self.assertEqual(len(results), 1)
+        self.assertIsInstance(results[0], LinterError)
+        self.assertEqual(
+            'script_xref(name:"URL", value:"https://example.com/foo/bar]");: Invalid URL'
+            " value (trailing ']')",
+            results[0].message,
+        )
+
+    def test_invalid_url_trailing_round_bracket(self):
+        content = (
+            '  script_xref(name:"URL", value:"https://example.com/foo/bar)");\n'
+        )
+        fake_context = self.create_file_plugin_context(
+            nasl_file=self.path, file_content=content
+        )
+        plugin = CheckScriptXrefUrl(fake_context)
+
+        results = list(plugin.run())
+
+        self.assertEqual(len(results), 1)
+        self.assertIsInstance(results[0], LinterError)
+        self.assertEqual(
+            'script_xref(name:"URL", value:"https://example.com/foo/bar)");: Invalid URL'
+            " value (trailing ')')",
+            results[0].message,
+        )
+
+    def test_invalid_url_wrong_ending(self):
+        content = '  script_xref(name:"URL", value:"https://confluence.atlassian.com/security/security-bulletin-may-21-2024-1387867145.htmll");\n'
+        fake_context = self.create_file_plugin_context(
+            nasl_file=self.path, file_content=content
+        )
+        plugin = CheckScriptXrefUrl(fake_context)
+
+        results = list(plugin.run())
+
+        self.assertEqual(len(results), 1)
+        self.assertIsInstance(results[0], LinterError)
+        self.assertEqual(
+            'script_xref(name:"URL", value:"https://confluence.atlassian.com/security/'
+            'security-bulletin-may-21-2024-1387867145.htmll");: Invalid URL'
+            " value (wrong file extension)",
+            results[0].message,
+        )

{troubadix-24.10.0 → troubadix-24.10.2}/tests/standalone_plugins/test_deprecate_vts.py

@@ -11,9 +11,9 @@ from troubadix.standalone_plugins.deprecate_vts import (
     _finalize_content,
     _get_summary,
     deprecate,
-    filter_files,
     get_files_from_path,
     parse_args,
+    parse_files,
     update_summary,
 )
 
@@ -26,7 +26,7 @@ class ParseArgsTestCase(unittest.TestCase):
 
         args = parse_args(
             [
-                "--files",
+                "--file",
                 testfile,
                 "--output-path",
                 output_path,
@@ -34,7 +34,7 @@ class ParseArgsTestCase(unittest.TestCase):
                 reason,
             ]
         )
-        self.assertEqual(args.files, [Path(testfile)])
+        self.assertEqual(args.file, [Path(testfile)])
         self.assertEqual(args.output_path, Path(output_path))
         self.assertEqual(args.deprecation_reason, reason)
 
@@ -47,7 +47,7 @@ class ParseArgsTestCase(unittest.TestCase):
         with self.assertRaises(SystemExit):
             parse_args(
                 [
-                    "--files",
+                    "--file",
                     testfile,
                     "--output-path",
                     output_path,
@@ -87,6 +87,28 @@ class ParseArgsTestCase(unittest.TestCase):
                 ]
             )
 
+    def test_parse_from_file(self):
+        output_path = "attic/"
+        with TemporaryDirectory() as tempdir:
+            from_file = tempdir / "from_file.txt"
+            testfile1 = tempdir / "testfile1.nasl"
+            testfile2 = tempdir / "testfile2.nasl"
+
+            from_file.write_text(f"{testfile1}\n{testfile2}\n", encoding="utf8")
+
+            args = parse_args(
+                [
+                    "--from-file",
+                    str(from_file),
+                    "--output-path",
+                    output_path,
+                    "-r",
+                    "NOTUS",
+                ]
+            )
+
+            self.assertEqual(args.from_file, from_file)
+
 
 NASL_CONTENT = (
     '...if(description)\n{\n  script_oid("1.3.6.1.4.1.25623.1.0.910673");'
@@ -190,16 +212,12 @@ class DeprecateVTsTestCase(unittest.TestCase):
 
             self.assertEqual(result, expected)
 
-    def test_filter_files(self):
+    def test_parse_files(self):
         with TemporaryDirectory() as in_dir:
             testfile1 = in_dir / "gb_rhsa_2021_8383_8383.nasl"
             testfile1.write_text(NASL_CONTENT, encoding="utf8")
-            testfile2 = in_dir / "gb_rhsa_2020_8383_8383.nasl"
-            testfile2.write_text(NASL_CONTENT, encoding="utf8")
 
-            result = filter_files(
-                files=[testfile1, testfile2], filename_prefix="gb_rhsa_2021"
-            )
+            result = parse_files(files=[testfile1])
             expected = [
                 DeprecatedFile(
                     name="gb_rhsa_2021_8383_8383.nasl",
@@ -209,15 +227,3 @@ class DeprecateVTsTestCase(unittest.TestCase):
             ]
 
             self.assertEqual(result, expected)
-
-    def test_filter_files_out(self):
-        with TemporaryDirectory() as in_dir:
-            testfile1 = in_dir / "gb_rhsa_2021_8383_8383.nasl"
-            testfile1.write_text(NASL_CONTENT, encoding="utf8")
-
-            result = filter_files(
-                files=[testfile1], filename_prefix="gb_rhsa_2020"
-            )
-            expected = []
-
-            self.assertEqual(result, expected)

{troubadix-24.10.0 → troubadix-24.10.2}/troubadix/__version__.py

@@ -2,4 +2,4 @@
 
 # THIS IS AN AUTOGENERATED FILE. DO NOT TOUCH!
 
-__version__ = "24.10.0"
+__version__ = "24.10.2"

{troubadix-24.10.0 → troubadix-24.10.2}/troubadix/plugins/script_xref_url.py

@@ -41,6 +41,10 @@ ALLOWED_URLS = [
     "http://mail-archives.apache.org/mod_mbox/perl-advocacy/2"
     "00904.mbox/<ad28918e0904011458h273a71d4x408f1ed286c9dfbc@mail.gmail.com>",
     "http://yehg.net/lab/pr0js/advisories/[mybb1.6]_cross_site_scripting",
+    "http://www.live555.com/liveMedia/public/changelog.txt#[2021.08.04]",
+    "http://www.live555.com/liveMedia/public/changelog.txt#[2021.08.06]",
+    "http://www.live555.com/liveMedia/public/changelog.txt#[2021.08.09]",
+    "http://www.live555.com/liveMedia/public/changelog.txt#[2021.08.13]",
 ]
 
 
@@ -63,11 +67,67 @@ class CheckScriptXrefUrl(FileContentPlugin):
         )
         for match in matches:
             if match:
-                if match.group("value") not in ALLOWED_URLS and not url(
-                    match.group("value")
-                ):
+                url_value = match.group("value")
+                if url_value in ALLOWED_URLS:
+                    continue
+
+                full_xref = match.group(0)
+
+                # First a few possible malformed URLs introduced by e.g. some automatic
+                # extraction or by copy'n'paste
+                if url_value.endswith(">") and "<" not in url_value:
+                    yield LinterError(
+                        f"{full_xref}: Invalid URL value (trailing '>')",
+                        file=nasl_file,
+                        plugin=self.name,
+                    )
+                    continue
+
+                if url_value.endswith(","):
+                    yield LinterError(
+                        f"{full_xref}: Invalid URL value (trailing ',')",
+                        file=nasl_file,
+                        plugin=self.name,
+                    )
+                    continue
+
+                if url_value.endswith(":"):
+                    yield LinterError(
+                        f"{full_xref}: Invalid URL value (trailing ':')",
+                        file=nasl_file,
+                        plugin=self.name,
+                    )
+                    continue
+
+                if url_value.endswith("]") and "[" not in url_value:
+                    yield LinterError(
+                        f"{full_xref}: Invalid URL value (trailing ']')",
+                        file=nasl_file,
+                        plugin=self.name,
+                    )
+                    continue
+
+                if url_value.endswith(")") and "(" not in url_value:
+                    yield LinterError(
+                        f"{full_xref}: Invalid URL value (trailing ')')",
+                        file=nasl_file,
+                        plugin=self.name,
+                    )
+                    continue
+
+                if url_value.endswith(".htmll"):
+                    yield LinterError(
+                        f"{full_xref}: Invalid URL value (wrong file extension)",
+                        file=nasl_file,
+                        plugin=self.name,
+                    )
+                    continue
+
+                # Additional standard check via the validators package
+                if not url(url_value, strict_query=False):
                     yield LinterError(
-                        f"{match.group(0)}: Invalid URL value",
+                        f"{full_xref}: Invalid URL value",
                         file=nasl_file,
                         plugin=self.name,
                     )
+                    continue

{troubadix-24.10.0 → troubadix-24.10.2}/troubadix/standalone_plugins/deprecate_vts.py

@@ -2,12 +2,14 @@
 # SPDX-FileCopyrightText: 2024 Greenbone AG
 
 import re
-from argparse import ArgumentParser, Namespace
+from argparse import ArgumentParser, ArgumentTypeError, Namespace
 from dataclasses import dataclass
 from enum import Enum
 from pathlib import Path
 from typing import Iterable, Optional
 
+from pontos.terminal.terminal import ConsoleTerminal
+
 from troubadix.argparser import directory_type, file_type
 from troubadix.helper.patterns import (
     ScriptTag,
@@ -15,6 +17,7 @@ from troubadix.helper.patterns import (
     get_script_tag_pattern,
     get_special_script_tag_pattern,
 )
+from troubadix.troubadix import from_file
 
 
 class Deprecations(Enum):
@@ -34,6 +37,15 @@ class DeprecatedFile:
 KB_ITEMS_PATTERN = re.compile(r"set_kb_item\(.+\);")
 
 
+def existing_file_type(string: str) -> Path:
+    file_path = Path(string)
+    if not file_path.exists():
+        raise ArgumentTypeError(f'File "{string}" does not exist.')
+    if not file_path.is_file():
+        raise ArgumentTypeError(f'"{string}" is not a file.')
+    return file_path
+
+
 def update_summary(file: DeprecatedFile, deprecation_reason: str) -> str:
     """Update the summary of the nasl script by adding the information
     that the script has been deprecated, and if possible, the oid of
@@ -83,26 +95,18 @@ def get_files_from_path(dir_path: Path = None) -> list:
     return [file for file in dir_path.glob("**/*")]
 
 
-def filter_files(
-    files: list, filename_prefix: str = None
-) -> list[DeprecatedFile]:
-    """Filter the files based on a provided prefix and convert them into
+def parse_files(files: list) -> list[DeprecatedFile]:
+    """Convert filepaths into
     DeprecatedFile objects
 
     Args:
         files: a list of files to deprecate, should be .nasl VTs
-        filename_prefix: an optional prefix to filter only specific files
 
     Returns:
         List of DeprecatedFile objects
 
     """
     to_deprecate = []
-    if filename_prefix:
-        filename_filter = re.compile(rf"{filename_prefix}")
-        files[:] = [
-            file for file in files if re.match(filename_filter, file.name)
-        ]
 
     for file in files:
         with file.open("r", encoding="latin-1") as fh:
@@ -193,16 +197,6 @@ def parse_args(args: Iterable[str] = None) -> Namespace:
         required=True,
         help="Path where the deprecated files should be written to.",
     )
-    parser.add_argument(
-        "-p",
-        "--filename-prefix",
-        metavar="<filename_prefix>",
-        nargs="?",
-        default=None,
-        type=str,
-        help="The prefix of the files you would like to deprecate,"
-        "for example 'gb_rhsa_2021' to filter on the year",
-    )
     parser.add_argument(
         "-r",
         "--deprecation-reason",
@@ -214,16 +208,17 @@ def parse_args(args: Iterable[str] = None) -> Namespace:
         "been merged with another still active VT, 'duplicate': The VT has"
         "a still active duplicate, 'defunct': The VT is no longer "
         "functional.",
+        required=True,
     )
     group = parser.add_mutually_exclusive_group(required=True)
     group.add_argument(
         "-f",
-        "--files",
-        metavar="<files>",
+        "--file",
+        metavar="<file>",
         nargs="+",
         default=None,
         type=file_type,
-        help="Files to deprecate",
+        help="File to deprecate",
     )
     group.add_argument(
         "-i",
@@ -231,20 +226,36 @@ def parse_args(args: Iterable[str] = None) -> Namespace:
         metavar="<input_path>",
         default=None,
         type=directory_type,
-        help="Path to the existing nasl script directory",
+        help="Path to a directory where all files should be deprecated.",
+    )
+    group.add_argument(
+        "--from-file",
+        metavar="<from_file>",
+        default=None,
+        type=existing_file_type,
+        help=(
+            "Path to a single file that contains a list of files "
+            "to be deprecated, separated by new lines."
+        ),
     )
     return parser.parse_args(args)
 
 
 def main():
     args = parse_args()
+    terminal = ConsoleTerminal()
     input_path = args.input_path if args.input_path else None
-    filename_prefix = args.filename_prefix
+    files = []
 
-    files = args.files or get_files_from_path(input_path)
-    filtered_files = filter_files(files, filename_prefix)
+    if input_path:
+        files = get_files_from_path(input_path)
+    elif args.from_file:
+        files = from_file(include_file=args.from_file, term=terminal)
+    elif args.file:
+        files = args.file
 
-    deprecate(args.output_path, filtered_files, args.deprecation_reason)
+    to_be_deprecated = parse_files(files)
+    deprecate(args.output_path, to_be_deprecated, args.deprecation_reason)
 
 
 if __name__ == "__main__":