ogc-na 0.3.41__py3-none-any.whl → 0.3.43__py3-none-any.whl

ogc/na/_version.py

@@ -12,5 +12,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '0.3.41'
-__version_tuple__ = version_tuple = (0, 3, 41)
+__version__ = version = '0.3.43'
+__version_tuple__ = version_tuple = (0, 3, 43)

ogc/na/annotate_schema.py

@@ -434,13 +434,15 @@ class SchemaAnnotator:
     """
 
     def __init__(self, schema_resolver: SchemaResolver | None = None,
-                 ref_mapper: Callable[[str, Any], str] | None = None):
+                 ref_mapper: Callable[[str, Any], str] | None = None,
+                 ignore_existing: bool = False):
         """
         :schema_resolver: an optional SchemaResolver to resolve references
         :ref_mapper: an optional function to map JSON `$ref`'s before resolving them
         """
         self.schema_resolver = schema_resolver or SchemaResolver()
         self._ref_mapper = ref_mapper
+        self.ignore_existing = ignore_existing
 
     def process_schema(self, location: Path | str | None,
                        default_context: str | Path | dict | None = None,
@@ -516,6 +518,14 @@ class SchemaAnnotator:
                     # skip JSON-LD keywords
                     continue
                 prop_value = properties[prop]
+
+                if not isinstance(prop_value, dict):
+                    continue
+
+                for key in list(prop_value.keys()):
+                    if self.ignore_existing and key.startswith(ANNOTATION_PREFIX):
+                        prop_value.pop(key, None)
+
                 prop_ctx = find_prop_context(prop, context_stack)
                 if prop_ctx:
                     used_terms.add(prop)
@@ -949,6 +959,12 @@ def _main():
         help='Dump visited properties and their ids to a file',
     )
 
+    parser.add_argument(
+        '--ignore-existing',
+        help="Ignore existing x-jsonld- properties when annotating",
+        action='store_true',
+    )
+
     args = parser.parse_args()
 
     if not args.schema:
@@ -976,7 +992,7 @@ def _main():
                 with open(args.dump_visited, 'w', newline='') as f:
                     write_visited(f)
     else:
-        annotator = SchemaAnnotator()
+        annotator = SchemaAnnotator(ignore_existing=args.ignore_existing)
         annotated = annotator.process_schema(args.schema, args.context)
         print(dump_yaml(annotated.schema))
 

ogc/na/input_filters/xml.py

@@ -13,6 +13,8 @@ Configuration values:
 * `namespace-separator` (default `:`): String that will be used to separate the namespace prefix and the local name
   when processing namespaces.
 * `text-property` (default: `_`): property name that will be used to put the element's text content into
+* `disable-entities` (default: `True`): disable processing of XML entities (to avoid XXE injections when parsing
+  untrusted data)
 """
 from __future__ import annotations
 
@@ -28,6 +30,7 @@ DEFAULT_CONF = {
     'attr-prefix': '_',
     'namespace-separator': ':',
     'text-property': '_',
+    'disable-entities': True,
 }
 
 
@@ -47,6 +50,7 @@ def apply_filter(content: bytes, conf: dict[str, Any] | None) -> tuple[dict[str,
                              attr_prefix=conf['attr-prefix'],
                              namespace_separator=conf['namespace-separator'],
                              cdata_key=conf['text-property'],
+                             disable_entities=conf['disable-entities'],
                              )
 
     return result, metadata

{ogc_na-0.3.41.dist-info → ogc_na-0.3.43.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ogc_na
-Version: 0.3.41
+Version: 0.3.43
 Summary: OGC Naming Authority tools
 Author-email: Rob Atkinson <ratkinson@ogc.org>, Piotr Zaborowski <pzaborowski@ogc.org>, Alejandro Villar <avillar@ogc.org>
 Project-URL: Homepage, https://github.com/opengeospatial/ogc-na-tools/
@@ -42,6 +42,14 @@ Requires-Dist: mkdocs-markdownextradata-plugin ; extra == 'dev'
 
 # ogc-na-tools
 
+## TL;DR
+
+You can install the tools with `pip`:
+
+```shell
+pip install ogc-na
+```
+
 ## Purpose
 This repository contains tools used to maintain controlled vocabularies and knowledge assets managed by the OGC Naming Authority. Such tools may have wider general applicability and be refactored into tool specific repositories.
 
@@ -67,6 +75,9 @@ The following tools are currently available:
 
 ## Development
 
+Note: This is only necessary if you are going to work *on* the tools themselves, not *with* them (see [TL;DR](#tldr)
+above). 
+
 To install runtime and development dependencies, run:
 
 ```shell

{ogc_na-0.3.41.dist-info → ogc_na-0.3.43.dist-info}/RECORD

@@ -1,6 +1,6 @@
 ogc/na/__init__.py,sha256=uzcNiJ3uKFNJ1HBfKxIwgAy2HMUFsLAe5RkrUg8ncac,464
-ogc/na/_version.py,sha256=I1C3LWqltYpw9njDDRZmwtJcus9JpC_LpEK-7On1Gf4,413
-ogc/na/annotate_schema.py,sha256=OA2lf2ejcyjuAN8LdEEyXlPXpjuC_yXHuKZal5DWlcA,39032
+ogc/na/_version.py,sha256=3SM8TQK0XTeTAO_UFFJd4QeOtXiE6t02ayy_xRZ5U98,413
+ogc/na/annotate_schema.py,sha256=zhg8sBSWcfr1JlGALomrKVhrmJQ8HMkIfLVf1yqQg9I,39592
 ogc/na/domain_config.py,sha256=C6ao37dbXEKv_K7WcfzQgI3H1Hr3c4-3p24hgl2oH54,13896
 ogc/na/download.py,sha256=2afrLyl4WsAlxkCgXsl47fs9mNKfDmhVpeT2iwNSoq0,3354
 ogc/na/gsp.py,sha256=KGa2G9i8kPefYTHNPUDoXnNyF7Tiwt8K__Ew_Qa7eeg,6048
@@ -13,8 +13,8 @@ ogc/na/util.py,sha256=ayMUT9HzNKynpSDTZ8epM8qSMTu4-_KlEL-Zlci2Pnk,11573
 ogc/na/validation.py,sha256=5xjHH55NZKM8HtUk8XgVzm8W5ZlZY00u_qsWfXK_8dM,3732
 ogc/na/input_filters/__init__.py,sha256=AhE7n_yECwxFKwOM3Jc0ft96TtF5i_Z-fHrS4HYOjaE,1179
 ogc/na/input_filters/csv.py,sha256=nFfB1XQF_QApcGGzMqEvzD_b3pBtCtsfUECsZ9UGE6s,2616
-ogc/na/input_filters/xml.py,sha256=OuAvrWqK8ybJ3LLifSB-hlfMsq8DF4ipxWMgqXkfm5U,1841
-ogc_na-0.3.41.dist-info/METADATA,sha256=Ek5AIyuVm2W6L6WYkckLh54a9uQGwgVfrzo_TUF-h7A,3587
-ogc_na-0.3.41.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-ogc_na-0.3.41.dist-info/top_level.txt,sha256=Kvy3KhzcIhNPT4_nZuJCmS946ptRr_MDyU4IIhZJhCY,4
-ogc_na-0.3.41.dist-info/RECORD,,
+ogc/na/input_filters/xml.py,sha256=9qYjp_w5JLInFM48zB15IYH9eTafjp1Aqd_8kfuW3aA,2074
+ogc_na-0.3.43.dist-info/METADATA,sha256=tANOeQvrhO_4uhdtrPJs2zpyG7gjSA-3InVOt-5_mx0,3796
+ogc_na-0.3.43.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+ogc_na-0.3.43.dist-info/top_level.txt,sha256=Kvy3KhzcIhNPT4_nZuJCmS946ptRr_MDyU4IIhZJhCY,4
+ogc_na-0.3.43.dist-info/RECORD,,