Merge branch 'master' of https://github.com/geopython/pycsw into ISO1…

…9115-3-part1

.github/workflows/vulnerabilities.yml

@@ -0,0 +1,40 @@
+name: Check vulnerabilities
+
+on:
+  push:
+    paths-ignore:
+      - '**.md'
+  pull_request:
+    branches:
+      - master
+    paths-ignore:
+      - '!**.md'
+  release:
+    types:
+      - released
+
+jobs:
+  clone:
+    runs-on: ubuntu-22.04
+    steps:
+      - name: Setup Python
+        uses: actions/setup-python@v1
+        with:
+          python-version: 3.8
+          architecture: x64
+      - name: Checkout pycsw
+        uses: actions/checkout@master
+
+  vulnerabilities:
+    needs: [clone]
+    runs-on: ubuntu-22.04
+
+    steps:
+    - name: Scan vulnerabilities with trivy
+      run: |
+        sudo apt-get install -y wget apt-transport-https gnupg lsb-release
+        wget -qO - https://aquasecurity.github.io/trivy-repo/deb/public.key | gpg --dearmor | sudo tee /usr/share/keyrings/trivy.gpg > /dev/null
+        echo "deb [signed-by=/usr/share/keyrings/trivy.gpg] https://aquasecurity.github.io/trivy-repo/deb $(lsb_release -sc) main" | sudo tee -a /etc/apt/sources.list.d/trivy.list
+        sudo apt-get update
+        sudo apt-get install -y trivy
+        trivy --exit-code 1 fs --scanners vuln,misconfig,secret --severity HIGH,CRITICAL --ignore-unfixed .

Dockerfile

@@ -50,7 +50,7 @@ RUN apt-get update && apt-get install --yes \
 
 RUN adduser --uid 1000 --gecos '' --disabled-password pycsw
 
-ENV PYCSW_CONFIG=/etc/pycsw/pycsw.cfg
+ENV PYCSW_CONFIG=/etc/pycsw/pycsw.yml
 
 WORKDIR /home/pycsw/pycsw
 
@@ -72,7 +72,7 @@ RUN pip install -U pip && \
 
 COPY --chown=pycsw . .
 
-COPY docker/pycsw.cfg ${PYCSW_CONFIG}
+COPY docker/pycsw.yml ${PYCSW_CONFIG}
 COPY docker/entrypoint.py /usr/local/bin/entrypoint.py
 
 RUN python3 -m pip install --editable .

LICENSE.txt

@@ -1,8 +1,8 @@
 The MIT License (MIT)
 =====================
 
-Copyright © 2010-2023 Tom Kralidis
-Copyright © 2011-2021 Angelos Tzotsos
+Copyright © 2010-2024 Tom Kralidis
+Copyright © 2011-2024 Angelos Tzotsos
 Copyright © 2012-2015 Adam Hinz
 Copyright © 2015-2021 Ricardo Garcia Silva
 

README.md

@@ -4,6 +4,7 @@
 [![Build Status](https://github.com/geopython/pycsw/workflows/build%20%E2%9A%99%EF%B8%8F/badge.svg)](https://github.com/geopython/pycsw/actions)
 [![Join the chat at https://gitter.im/geopython/pycsw](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/geopython/pycsw)
 [![Documentation](https://readthedocs.org/projects/pycsw/badge/)](https://docs.pycsw.org)
+[![Vulnerabilities](https://github.com/geopython/pycsw/actions/workflows/vulnerabilities.yml/badge.svg)](https://github.com/geopython/pycsw/actions/workflows/vulnerabilities.yml)
 
 [pycsw](https://pycsw.org) is an OGC API - Records and CSW server implementation written in Python.
 

default-sample.yml

@@ -0,0 +1,126 @@
+# =================================================================
+#
+# Authors: Tom Kralidis <[email protected]>
+#          Angelos Tzotsos <[email protected]>
+#
+# Copyright (c) 2024 Tom Kralidis
+# Copyright (c) 2024 Angelos Tzotsos
+#
+# Permission is hereby granted, free of charge, to any person
+# obtaining a copy of this software and associated documentation
+# files (the "Software"), to deal in the Software without
+# restriction, including without limitation the rights to use,
+# copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the
+# Software is furnished to do so, subject to the following
+# conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+# OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+# HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+# WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+# OTHER DEALINGS IN THE SOFTWARE.
+#
+# =================================================================
+
+server:
+    url: http://localhost/pycsw/csw.py
+    mimetype: application/xml; charset=UTF-8
+    encoding: UTF-8
+    language: en-US
+    maxrecords: 10
+    #ogc_schemas_location: http://foo
+    #pretty_print: true
+    gzip_compresslevel: 9
+    #domainquerytype: range
+    #domaincounts: true
+    #spatial_ranking: true
+    #workers=2
+    #timeout=30
+
+logging:
+    level: ERROR
+    #logfile: /tmp/pycsw.log
+
+profiles:
+    - apiso
+
+federatedcatalogues:
+    - http://catalog.data.gov/csw
+
+manager:
+    transactions: false
+    allowed_ips:
+        - 127.0.0.1
+    csw_harvest_pagesize: 10
+
+metadata:
+    identification:
+        title: pycsw Geospatial Catalogue
+        description: pycsw is an OARec and OGC CSW server implementation written in Python
+        keywords:
+            - catalogue
+            - discovery
+            - metadata
+        keywords_type: theme
+        fees: None
+        accessconstraints: None
+        terms_of_service: https://creativecommons.org/licenses/by/4.0
+        url: https://example.org
+    license:
+        name: CC-BY 4.0 license
+        url: https://creativecommons.org/licenses/by/4.0
+    provider:
+        name: Organization Name
+        url: https://pycsw.org
+    contact:
+        name: Lastname, Firstname
+        position: Position Title
+        address: Mailing Address
+        city: City
+        stateorprovince: Administrative Area
+        postalcode: Zip or Postal Code
+        country: Country
+        phone: +xx-xxx-xxx-xxxx
+        fax: +xx-xxx-xxx-xxxx
+        email: [email protected]
+        url: Contact URL
+        hours: Mo-Fr 08:00-17:00
+        instructions: During hours of service. Off on weekends.
+        role: pointOfContact
+    inspire:
+        enabled: true
+        languages_supported:
+            - eng
+            - gre
+        default_language: eng
+        date: YYYY-MM-DD
+        gemet_keywords:
+            - Utility and governmental services
+        conformity_service: notEvaluated
+        contact_name: Organization Name
+        contact_email: Email Address
+        temp_extent:
+            begin: YYYY-MM-DD
+            end: YYYY-MM-DD
+
+repository:
+    # sqlite
+    database: sqlite:////var/www/pycsw/tests/functionaltests/suites/cite/data/cite.db
+    # postgres
+    #database: postgresql://username:password@localhost/pycsw
+    # mysql
+    #database: mysql://username:password@localhost/pycsw?charset=utf8
+    #mappings: path/to/mappings.py
+    table: records
+    #filter: type = 'http://purl.org/dc/dcmitype/Dataset'
+    #max_retries: 5
+    facets:
+        - type
+        - title

docker/compose/docker-compose.yml

@@ -67,7 +67,7 @@ services:
     ports:
       - 8000:8000
     volumes:
-      - ./pycsw.cfg:/etc/pycsw/pycsw.cfg
+      - ./pycsw.yml:/etc/pycsw/pycsw.yml
 
 
 volumes: