diff --git a/README.rst b/README.rst index 6620cc756..006e37d23 100644 --- a/README.rst +++ b/README.rst @@ -35,8 +35,8 @@ Build and tests status |Build Status| |Code License| |Data License| |Python 3.8+| |stability-wip| |Gitter chat| -.. |Build Status| image:: https://github.com/nexB/vulnerablecode/actions/workflows/main.yml/badge.svg?branch=main - :target: https://github.com/nexB/vulnerablecode/actions?query=workflow%3ACI +.. |Build Status| image:: https://github.com/aboutcode-org/vulnerablecode/actions/workflows/main.yml/badge.svg?branch=main + :target: https://github.com/aboutcode-org/vulnerablecode/actions?query=workflow%3ACI .. |Code License| image:: https://img.shields.io/badge/Code%20License-Apache--2.0-green.svg :target: https://opensource.org/licenses/Apache-2.0 .. |Data License| image:: https://img.shields.io/badge/Data%20License-CC--BY--SA--4.0-green.svg diff --git a/docs/source/installation.rst b/docs/source/installation.rst index 9e9f3c7d1..baae9d8a2 100644 --- a/docs/source/installation.rst +++ b/docs/source/installation.rst @@ -148,7 +148,7 @@ Install the required dependencies:: You can specify the Python version during the ``make dev`` step using the following command:: - make dev PYTHON_EXE=python3.8.10 + make dev PYTHON_EXE=python3.12 When ``PYTHON_EXE`` is not specified, by default, the ``python3`` executable is used. diff --git a/docs/source/reference_importer_overview.rst b/docs/source/reference_importer_overview.rst index 04e56dd39..02a35aa85 100644 --- a/docs/source/reference_importer_overview.rst +++ b/docs/source/reference_importer_overview.rst @@ -8,10 +8,10 @@ and for storing the scraped information in a structured fashion. The structured importer then provides input to an improver (see :ref:`improver-overview`), which is responsible for creating a relational model for advisories, affected packages and fixed packages. -All importer implementation-related code is defined in :file:`vulnerabilites/importer.py`. +All importer implementation-related code is defined in :file:`vulnerabilities/importer.py`. In addition, the framework-related code for actually invoking and processing the importers is -located in :file:`vulnerabilites/import_runner.py`. +located in :file:`vulnerabilities/import_runner.py`. The importers, after scraping, provide ``AdvisoryData`` objects. These objects are then processed and inserted into the ``Advisory`` model. @@ -23,7 +23,7 @@ modifications. Given that a lot of advisories publish version ranges of affected packages, it is necessary to store those ranges in a structured manner. *Vers* was designed to -solve this problem. It has been implemented in the `univers `_ +solve this problem. It has been implemented in the `univers `_ library whose development goes hand in hand with VulnerableCode. The data imported by importers is not useful by itself: it must be processed into a relational diff --git a/docs/source/soc_gsoc21.rst b/docs/source/soc_gsoc21.rst index ff995c229..07a63398d 100644 --- a/docs/source/soc_gsoc21.rst +++ b/docs/source/soc_gsoc21.rst @@ -71,7 +71,7 @@ over any unnecessary files for deployment. Add Makefile ^^^^^^^^^^^^^ Makefile usage is prevalent in sister projects like `ScanCodeIO -`_. It gives VulnerableCode a consistent +`_. It gives VulnerableCode a consistent behavior and provides a very friendly interface for invocations. This also avoids security risks like having a default django ``SECRET_KEY`` as it can be easily generated by a make target. I added a Makefile which has a similar diff --git a/setup.cfg b/setup.cfg index a4ae10cee..45e176aeb 100644 --- a/setup.cfg +++ b/setup.cfg @@ -7,7 +7,7 @@ license = Apache-2.0 AND CC-BY-SA-4.0 description = VulnerableCode is a free and open database of open source software package vulnerabilities because open source software vulnerabilities data and tools should be free and open source themselves. long_description = file:README.rst long_description_content_type = text/x-rst -url = https://github.com/nexB/vulnerablecode +url = https://github.com/aboutcode-org/vulnerablecode author = nexB. Inc. and others author_email = info@aboutcode.org diff --git a/vulnerabilities/templates/navbar.html b/vulnerabilities/templates/navbar.html index 530c2521e..8330605d6 100644 --- a/vulnerabilities/templates/navbar.html +++ b/vulnerabilities/templates/navbar.html @@ -50,11 +50,11 @@
  • Source code and support at https://github.com/nexB/vulnerablecode + href="https://github.com/aboutcode-org/vulnerablecode">https://github.com/aboutcode-org/vulnerablecode
  • - Docs at - https://vulnerablecode.readthedocs.org/ + Docs at + https://vulnerablecode.readthedocs.io/
  • Sponsored by NLnet diff --git a/vulnerabilities/views.py b/vulnerabilities/views.py index b5ba74214..710e8dcda 100644 --- a/vulnerabilities/views.py +++ b/vulnerabilities/views.py @@ -805,8 +805,8 @@ def get(self, request): and the tools to aggregate and correlate these vulnerabilities. Chat at https://gitter.im/aboutcode-org/vulnerablecode -Docs at https://vulnerablecode.readthedocs.org/ -Source code and issues at https://github.com/nexB/vulnerablecode +Docs at https://vulnerablecode.readthedocs.io/ +Source code and issues at https://github.com/aboutcode-org/vulnerablecode """ diff --git a/vulnerablecode/settings.py b/vulnerablecode/settings.py index 6bf4b1e46..222339fe7 100644 --- a/vulnerablecode/settings.py +++ b/vulnerablecode/settings.py @@ -287,7 +287,7 @@ 
    User-Agent: {VCIO_USER_AGENT}
    Requests without this exact header value will be rejected.

    VulnerableCode is open data and free software by - nexB Inc. and others. + nexB Inc. and others.

    API is throttled for anon users it is 10/minute and 30/minute for user with API key

    Please refer to urllib3 documentation and set respect_retry_after_header as True to respect the Retry-After header.

    @@ -326,7 +326,7 @@ }, "LICENSE": { "name": "Source code: Apache-2.0 | Data: CC-BY-SA-4.0", - "url": "https://github.com/nexb/vulnerablecode#license", + "url": "https://github.com/aboutcode-org/vulnerablecode#license", }, "SERVE_INCLUDE_SCHEMA": False, # shorthand to use the sidecar instead diff --git a/vulntotal/datasources/vulnerablecode.py b/vulntotal/datasources/vulnerablecode.py index d0122db83..a4d4fc52c 100644 --- a/vulntotal/datasources/vulnerablecode.py +++ b/vulntotal/datasources/vulnerablecode.py @@ -24,7 +24,7 @@ class VulnerableCodeDataSource(DataSource): spdx_license_expression = "CC-BY-SA-4.0" - license_url = "https://github.com/nexB/vulnerablecode/blob/main/cc-by-sa-4.0.LICENSE" + license_url = "https://github.com/aboutcode-org/vulnerablecode/blob/main/cc-by-sa-4.0.LICENSE" global_instance = "https://public.vulnerablecode.io/" vc_purl_search_api_path = "api/packages/bulk_search/"