Merge pull request #173 from hoefling/no-xslt-support

Support building without XSLT support

Author: hoefling

.github/workflows/linuxbrew.yml

@@ -0,0 +1,33 @@
+name: linuxbrew
+on: [push, pull_request]
+jobs:
+  linuxbrew:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v1
+      - name: Setup Python
+        uses: actions/setup-python@v2
+        with:
+          python-version: ${{ matrix.python }}
+      - name: Install build dependencies
+        run: |
+          sudo apt install -y build-essential procps curl file git
+          /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)"
+          test -d ~/.linuxbrew && eval $(~/.linuxbrew/bin/brew shellenv)
+          test -r ~/.bash_profile && echo "eval \$($(brew --prefix)/bin/brew shellenv)" >>~/.bash_profile
+          echo "eval \$($(brew --prefix)/bin/brew shellenv)" >>~/.profile
+          brew update
+          brew install python gcc libxml2 libxmlsec1 pkg-config
+          pip3 install --upgrade setuptools wheel
+          ln -s $(brew --prefix)/bin/gcc-11 $(brew --prefix)/bin/gcc-5
+      - name: Build linux_x86_64 wheel
+        run: |
+          python3 setup.py bdist_wheel
+          rm -rf build/
+      - name: Install test dependencies
+        run: |
+          pip3 install --upgrade -r requirements-test.txt
+          pip3 install xmlsec --only-binary=xmlsec --no-index --find-links=dist/
+      - name: Run tests
+        run: |
+          pytest -v --color=yes

.github/workflows/manylinux2010.yml

@@ -6,7 +6,7 @@ jobs:
     container: quay.io/pypa/manylinux2010_x86_64
     strategy:
       matrix:
-        python-abi: [cp35-cp35m, cp36-cp36m, cp37-cp37m, cp38-cp38, cp39-cp39]
+        python-abi: [cp36-cp36m, cp37-cp37m, cp38-cp38, cp39-cp39]
     steps:
       - uses: actions/checkout@v1
       - name: Install build dependencies
@@ -19,6 +19,8 @@ jobs:
       - name: Build linux_x86_64 wheel
         env:
           PYXMLSEC_STATIC_DEPS: true
+          # disable libxml2-2.9.12 because of https://gitlab.gnome.org/GNOME/libxslt/-/issues/52
+          PYXMLSEC_LIBXML2_VERSION: 2.9.10
         run: |
           /opt/python/${{ matrix.python-abi }}/bin/python setup.py bdist_wheel
       - name: Label manylinux2010_x86_64 wheel
@@ -27,7 +29,7 @@ jobs:
           auditwheel show dist/xmlsec-${{ env.PKGVER }}-${{ matrix.python-abi }}-linux_x86_64.whl
           auditwheel repair dist/xmlsec-${{ env.PKGVER }}-${{ matrix.python-abi }}-linux_x86_64.whl
           ls -l wheelhouse/
-          auditwheel show wheelhouse/xmlsec-${{ env.PKGVER }}-${{ matrix.python-abi }}-manylinux2010_x86_64.whl
+          auditwheel show wheelhouse/xmlsec-${{ env.PKGVER }}-${{ matrix.python-abi }}-manylinux_2_12_x86_64.manylinux2010_x86_64.whl
       - name: Install test dependencies
         run: |
           /opt/python/${{ matrix.python-abi }}/bin/pip install --upgrade -r requirements-test.txt

.github/workflows/sdist.yml

@@ -18,6 +18,8 @@ jobs:
       - name: Install test dependencies
         env:
           PYXMLSEC_STATIC_DEPS: true
+          # disable libxml2-2.9.12 because of https://gitlab.gnome.org/GNOME/libxslt/-/issues/52
+          PYXMLSEC_LIBXML2_VERSION: 2.9.10
         run: |
           pip install --upgrade -r requirements-test.txt
           pip install dist/xmlsec-$(python setup.py --version).tar.gz

README.rst

@@ -11,6 +11,8 @@ python-xmlsec
    :target: https://github.com/mehcode/python-xmlsec/actions?query=workflow%3A%22manylinux2010%22
 .. image:: https://github.com/mehcode/python-xmlsec/workflows/MacOS/badge.svg
    :target: https://github.com/mehcode/python-xmlsec/actions?query=workflow%3A%22MacOS%22
+.. image:: https://github.com/mehcode/python-xmlsec/workflows/linuxbrew/badge.svg
+   :target: https://github.com/mehcode/python-xmlsec/actions?query=workflow%3A%22linuxbrew%22
 .. image:: https://codecov.io/gh/mehcode/python-xmlsec/branch/master/graph/badge.svg
    :target: https://codecov.io/gh/mehcode/python-xmlsec
 .. image:: https://img.shields.io/readthedocs/xmlsec/latest?logo=read-the-docs

src/constants.c

@@ -485,7 +485,6 @@ int PyXmlSec_ConstantsModule_Init(PyObject* package) {
     PYXMLSEC_ADD_TRANSFORM_CONSTANT(TransformXPath, "XPATH");
     PYXMLSEC_ADD_TRANSFORM_CONSTANT(TransformXPath2, "XPATH2");
     PYXMLSEC_ADD_TRANSFORM_CONSTANT(TransformXPointer, "XPOINTER");
-    PYXMLSEC_ADD_TRANSFORM_CONSTANT(TransformXslt, "XSLT");
     PYXMLSEC_ADD_TRANSFORM_CONSTANT(TransformRemoveXmlTagsC14N, "REMOVE_XML_TAGS_C14N");
     PYXMLSEC_ADD_TRANSFORM_CONSTANT(TransformVisa3DHack, "VISA3D_HACK");
 
@@ -502,6 +501,9 @@ int PyXmlSec_ConstantsModule_Init(PyObject* package) {
 #ifndef XMLSEC_NO_DSA
     PYXMLSEC_ADD_TRANSFORM_CONSTANT(TransformDsaSha1, "DSA_SHA1");
 #endif
+#ifndef XMLSEC_NO_XSLT
+    PYXMLSEC_ADD_TRANSFORM_CONSTANT(TransformXslt, "XSLT");
+#endif
 
 #if XMLSEC_VERSION_HEX > 0x10212
     // from version 1.2.19

tests/test_ds.py

@@ -1,3 +1,4 @@
+import unittest
 import xmlsec
 from tests import base
 
@@ -194,6 +195,7 @@ def test_sign_binary_no_key(self):
         with self.assertRaisesRegex(xmlsec.Error, 'Sign key is not specified.'):
             ctx.sign_binary(bytes=b'', transform=consts.TransformRsaSha1)
 
+    @unittest.skipIf(not hasattr(consts, 'TransformXslt'), reason='XSLT transformations not enabled')
     def test_sign_binary_invalid_signature_method(self):
         ctx = xmlsec.SignatureContext()
         ctx.key = xmlsec.Key.from_file(self.path("rsakey.pem"), format=consts.KeyDataFormatPem)

tests/test_templates.py

@@ -1,3 +1,4 @@
+import unittest
 from lxml import etree
 
 import xmlsec
@@ -195,6 +196,7 @@ def test_encrypted_data_ensure_key_info_bad_args(self):
         with self.assertRaises(TypeError):
             xmlsec.template.encrypted_data_ensure_key_info('')
 
+    @unittest.skipIf(not hasattr(consts, 'TransformXslt'), reason='XSLT transformations not enabled')
     def test_transform_add_c14n_inclusive_namespaces(self):
         root = self.load_xml("doc.xml")
         sign = xmlsec.template.create(root, c14n_method=consts.TransformExclC14N, sign_method=consts.TransformRsaSha1)