[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-2-1' - 3 commits - etc/ca-chain.cert.pem etc/cert.pem etc/key.pem wsd/DocumentBroker.cpp wsd/LOOLWSD.hpp
Andras Timar
andras.timar at collabora.com
Wed Apr 18 07:46:12 UTC 2018
etc/ca-chain.cert.pem | 89 +++++++++++--------------------------------------
etc/cert.pem | 51 +++++++++-------------------
etc/key.pem | 50 +++++++++++++--------------
wsd/DocumentBroker.cpp | 6 ++-
wsd/LOOLWSD.hpp | 7 ++-
5 files changed, 73 insertions(+), 130 deletions(-)
New commits:
commit e126149e225c18f8d5a20d0b8739550b96f24e26
Author: Andras Timar <andras.timar at collabora.com>
Date: Sat Apr 14 17:50:46 2018 +0200
new dummy ssl key and cert for testing
Change-Id: Ia2586c4201696e0d80d2be3f284564e65fac71c0
Reviewed-on: https://gerrit.libreoffice.org/52874
Reviewed-by: Andras Timar <andras.timar at collabora.com>
Tested-by: Andras Timar <andras.timar at collabora.com>
(cherry picked from commit 558e20f98142ae85786ec9a5214bf5ef734f25b4)
Signed-off-by: Andras Timar <andras.timar at collabora.com>
diff --git a/etc/ca-chain.cert.pem b/etc/ca-chain.cert.pem
index 5793ad42b..7ed7f4bc0 100644
--- a/etc/ca-chain.cert.pem
+++ b/etc/ca-chain.cert.pem
@@ -1,71 +1,22 @@
-----BEGIN CERTIFICATE-----
-MIIGLDCCBBSgAwIBAgICEAAwDQYJKoZIhvcNAQELBQAwgaoxCzAJBgNVBAYTAkdC
-MRAwDgYDVQQIDAdFbmdsYW5kMRIwEAYDVQQHDAlDYW1icmlkZ2UxIzAhBgNVBAoM
-GkNvbGxhYm9yYSBQcm9kdWN0aXZpdHkgTHRkMSUwIwYDVQQDDBxDb2xsYWJvcmEg
-Q2xvdWRTdWl0ZSBSb290IENBMSkwJwYJKoZIhvcNAQkBFhphbmRyYXMudGltYXJA
-Y29sbGFib3JhLmNvbTAeFw0xNjAzMjMxMzU3NTdaFw0yNjAzMjExMzU3NTdaMIGe
-MQswCQYDVQQGEwJHQjEQMA4GA1UECAwHRW5nbGFuZDEjMCEGA1UECgwaQ29sbGFi
-b3JhIFByb2R1Y3Rpdml0eSBMdGQxLTArBgNVBAMMJENvbGxhYm9yYSBDbG91ZFN1
-aXRlIEludGVybWVkaWF0ZSBDQTEpMCcGCSqGSIb3DQEJARYaYW5kcmFzLnRpbWFy
-QGNvbGxhYm9yYS5jb20wggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDT
-aaiae2bkWpLrvuBRTNQeaiTbdHmpKbfk8avlCFUxZPI3AaJKNCCISghriDgmftCf
-jO65/K0vPLuMjhKm1MT4NfcIz5szfwq1ikNptQKw7w88JgkKQJLoCZ3IHpd7um15
-0QtseNaUX3VfidJDML/DnaZlrkSb54xCKakV8C3gtEpU9P8+BQX5LUJNhyAsA3Iv
-SuP8kDmBluf2DnYuPfbLqwyS9YU8Ch3yWee2CH0yzWD+I3qft540DsbIMnv4ncuG
-PHxNsSTPEEo2B4kylrQO0CJbGaYm2Y42O79sv/W//HZmAY9UjfnY99DwX0MmZgqg
-/AZu1uBg//MZHQT6ZZ3PYZnRvEztrL1+Fs1EHI83H2c4DhLCO8iNVhFycWxHkwj6
-lnh0ZNu4HPC0V3E5gQFFzNHX6gxPBC2EuwMyNok0GbBm2DFXz7kMKCB/X4OYZKKH
-YEoi3bQEQ9TwwgcG5RIehpN8qoCOUMxe6SfgFAPpNDtKbwXqfvKBKwVHaW0K6cHQ
-66vrZvo9/2GhfYS/dNYdX7WHebopbhJ34PFk5jalm6bD/kvJqjJ2zGd57gZtdppi
-A1ZX4J9MHTO68y4TbBPfCPt6KpMK/fnp53LA0oFZ9XntFLrLV4hFOGndwtil321s
-BOoQkZQr/BlzPP5RKVhO31r5d7lbCRkQKRPLBLTcqwIDAQABo2YwZDAdBgNVHQ4E
-FgQUaTO589awe53N6Hi013vEvniVrmwwHwYDVR0jBBgwFoAUrPe5NOpqgYZPbA+w
-JhGqEBdxgrkwEgYDVR0TAQH/BAgwBgEB/wIBADAOBgNVHQ8BAf8EBAMCAYYwDQYJ
-KoZIhvcNAQELBQADggIBAHYUXHYASO3PqA9KnjaGn01qJcFOp7GWK8nKg6EN1ws4
-cQ7GQEwJFxR1bjaaaDA1jnmOuByJCGKX6wGCgg1zAnptyN9lnAcHnxsXZgRq5sLT
-qFwtrS0iG1IGNwGADLZMtKPmFKxKKd8BdeuIcSOxzJIL31sCtizVu6+WwXUxiHI+
-ujTcKEaFWCKotiHrLXRdhj4+NXf6SGfzs9Iz57+mozebcL2eCIWRkM2Q+BDWXd/G
-4j8tBHt0ZmTG0tE1sS7/IgfWtTrAzP8cNA//zrxbYCi0rUIx2E07iCvf3EQ4ANl8
-U1hA5vKbFOFkkzg57H9usThHiFwBdQcDpHgj3sQs/NhT1UYoc/+uU9TBgSPZg35U
-L/tLtqqshwYs27WlFndEtQimwopAXUPjgaQXOM+erdwh8k7vJyrw4ySqWz6BfZCw
-ohzgRWnQZL5RMic6y5UZuAAudc9t3YylYbz6bNmp/8nyisHtFMMFSm9OEFrE+NE7
-AL1idFrFqtIDrG6ehdBXK+O1a0dli13G59JLguN2sDODCA1B7EKGmXIwfkNGqnyt
-zRQ1PTqu3kG5ywjWtlGbURuk9+NwgEUDH8jQOoO3wvtNlM6Tik/jO8d5EKheohDf
-WaNXolDqXz+rYBjlqyEA8VJN5nkpwl3d2vR3Kdathtq9SFefe0zwn2wRxAGHSnbM
------END CERTIFICATE-----
------BEGIN CERTIFICATE-----
-MIIGPDCCBCSgAwIBAgIJANfAzfWho/TpMA0GCSqGSIb3DQEBCwUAMIGqMQswCQYD
-VQQGEwJHQjEQMA4GA1UECAwHRW5nbGFuZDESMBAGA1UEBwwJQ2FtYnJpZGdlMSMw
-IQYDVQQKDBpDb2xsYWJvcmEgUHJvZHVjdGl2aXR5IEx0ZDElMCMGA1UEAwwcQ29s
-bGFib3JhIENsb3VkU3VpdGUgUm9vdCBDQTEpMCcGCSqGSIb3DQEJARYaYW5kcmFz
-LnRpbWFyQGNvbGxhYm9yYS5jb20wHhcNMTYwMzIzMTM0MzI3WhcNMzYwMzE4MTM0
-MzI3WjCBqjELMAkGA1UEBhMCR0IxEDAOBgNVBAgMB0VuZ2xhbmQxEjAQBgNVBAcM
-CUNhbWJyaWRnZTEjMCEGA1UECgwaQ29sbGFib3JhIFByb2R1Y3Rpdml0eSBMdGQx
-JTAjBgNVBAMMHENvbGxhYm9yYSBDbG91ZFN1aXRlIFJvb3QgQ0ExKTAnBgkqhkiG
-9w0BCQEWGmFuZHJhcy50aW1hckBjb2xsYWJvcmEuY29tMIICIjANBgkqhkiG9w0B
-AQEFAAOCAg8AMIICCgKCAgEAwbDk+4wViZt5KRtbKxt385++bifvNh4snODlN/Oq
-+BlY07KgK3XkltrSvrrXrVI44f/qvLLdzD/KKjR4tFUntD638Hfre9mrs6grbkC7
-OniecOkrE06maSgOzGEJjbH3IkBPJkLt3Lehp0aWLO/4lweHsO2FXWfX8F0Tzi+B
-TyqDOpO1Utb2y9gjfJFj0cx0hBdokzjmlEuP9nb1rwh3aTNQqVG5UXDj+eNZP93k
-5Bjh39RnYYQvNnJkdUjacBVjxWSFVqeZYIsVpKh8qLiUUPp2h4jZ2l6uL/Kub9Xz
-iVRUS67e12J/u6HSzOsN38UW7a2S5IK32sIv0p/mMPzpXAnAe7V4PBsvagN/RtTV
-M9R2S4w8/XMzjcBzK16AZ+0FAYo1+6ZXNTfLp5JXkez6FUSAaGIVo2n1PJb3/ovs
-1rorkNv+5S9tZ1nj27i/WNo6ACajePX+v2HnG7EWk6B7HKBqKtPMzMwIJbN5PfcZ
-iWACSMrjkBLhHbWLUwpy32Xe3zz3tPxdiAjLF2voCoSZuRscti2QEzrWqhAX0CXF
-bVeGBjBKgvS3oLIYnvwnVO2h20l1jHpD4HyCyK+RhJro625xxuDZsnv5l89+35oN
-hrGNC5LamicfpTJIQUatKT03E/XpPlhBsbxejXQbSiw169Q+7YDhZl1/aBbtysD1
-PSkCAwEAAaNjMGEwHQYDVR0OBBYEFKz3uTTqaoGGT2wPsCYRqhAXcYK5MB8GA1Ud
-IwQYMBaAFKz3uTTqaoGGT2wPsCYRqhAXcYK5MA8GA1UdEwEB/wQFMAMBAf8wDgYD
-VR0PAQH/BAQDAgGGMA0GCSqGSIb3DQEBCwUAA4ICAQAktNkfAEQGeFqXXfStyrPP
-X55v9BeWQn/X/w2pDOOp7It6LBuhntThp1oYrdK09ZSfGHY1H6QaAq5lY1GsABz4
-+pYnMmnymfE6k9Vy57y/rp/nFTneH9RDLygHDvYF5/LJpnxfsXYxmQiRJBulPQQl
-C3oI+USQZppl2LBPRkwZLw9dRQL9Bz49MWuu1I6Y4K+LcegEpiINKJrVU1zRWIpj
-k0LDjyasZIXp4jfBK4kjo3GeGDgpDjcMIVf4nTtkYZ8wdj78f6kP9JKdph+/VtEw
-k4PYsfccpDycHCZ5wY8VqrQ62qJbBOpwmfVqb53KvmffbZxXhZxv9jxGk9gTsZnm
-w/jXWpDLXpsDXZ4CA7CHv2YfWj/JkE51wzP/hNoHhWYi44Ky6tKi0a81U8Ve3zws
-WRolq9g07K24HAHTgo/3COP/Ql1t4KCfG4bHfu/13ExUScub7xivUZxsdrbcVPkj
-spUKJV0L25KTSKCfRITbVVx/mTjK0PFQvQNJFHBDy+7Sp9KZUcaNgsXUw4hyQf/5
-LWiKW9DPSJVU+7dHuFgBCBbfmsQxQjU4iDfSg05+mF8KqSWgn5VtDdKNro3C1+q0
-jICh3QCYFvFw671jGV8mnGMquVTkC5Dke/jq3PAHxgC7tWasIHeOt9C0lH5o6b96
-NfVWnTHVF4DnJBsp3jyyMQ==
+MIIDlzCCAn+gAwIBAgIJAIJMyest2ZhqMA0GCSqGSIb3DQEBCwUAMGIxCzAJBgNV
+BAYTAkRFMQswCQYDVQQIDAJCVzESMBAGA1UEBwwJU3R1dHRnYXJ0MRgwFgYDVQQK
+DA9EdW1teSBBdXRob3JpdHkxGDAWBgNVBAMMD0R1bW15IEF1dGhvcml0eTAeFw0x
+ODA0MTQxNTQ4MzlaFw00MzA0MTQxNTQ4MzlaMGIxCzAJBgNVBAYTAkRFMQswCQYD
+VQQIDAJCVzESMBAGA1UEBwwJU3R1dHRnYXJ0MRgwFgYDVQQKDA9EdW1teSBBdXRo
+b3JpdHkxGDAWBgNVBAMMD0R1bW15IEF1dGhvcml0eTCCASIwDQYJKoZIhvcNAQEB
+BQADggEPADCCAQoCggEBALaJtw2zK+ai+LTCoIODetMspVZzutrA6KYDGnGO203B
+kcR8jLgXyCduFlvYKyd3RFx/UcaI5DqW4MvVMefi/2WHpNc1Lde6nnNUMqaz+VPD
+GyRkbXM/op2IJGZy6BqqoyeAuzak60cE7lCba4mGJC/hW8TUIDjFS58s9yNWL1IF
+YsZWOENTS744Fd8TYFCoAEmSCrqfvpwp+fXd6azWLgHKoTeEWccSkxR9JPWg6nqr
+7TgL+tLjfin1Nim1bDe2xJf3FsbjAUhIIKXQAGWjv6zzd6OT0/4iPvIhSnaqPyJ0
+XAGtTmjr2o+tkwTVhRVsQADx8hglvNoa73J0kKtGZzUCAwEAAaNQME4wHQYDVR0O
+BBYEFIb7HhPssW73+DCkHQPjUNiisANgMB8GA1UdIwQYMBaAFIb7HhPssW73+DCk
+HQPjUNiisANgMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAB3dd5kE
+LwZjcp4O38ep7APiS0MZD67UnZ47zqSkVrhzph2/ZYn+cN3cDcOgFGUy4hx9MkKh
+mD6LcoCLNWjneF7R3deK46KsKfZl2a0sHMtVPn/Mlh4tqWax1FaKkDPfvRD009qZ
+5B3Vt4wHJiZY+WqKWmuTKtJRE9ob5Ovrl9PQr2xZKoT2kOSrQviQbsf/ui/hRmti
+iGQEJXCt4BVjVfLz7CwKENE8UPi2ngowb5uSNtglfbTXG8TyNtefD0veuidG7dc/
+0FzqvXbYhcMXlFtOr9SeGVz/i6O1yHQJLdvXq+VUi3pJQrcXjOFJbjWxUvdqknET
+pSWB94W8g3Tfx+s=
-----END CERTIFICATE-----
diff --git a/etc/cert.pem b/etc/cert.pem
index a0a2a2960..f53a1ba55 100644
--- a/etc/cert.pem
+++ b/etc/cert.pem
@@ -1,35 +1,20 @@
-----BEGIN CERTIFICATE-----
-MIIGKzCCBBOgAwIBAgICEAswDQYJKoZIhvcNAQELBQAwgZ4xCzAJBgNVBAYTAkdC
-MRAwDgYDVQQIDAdFbmdsYW5kMSMwIQYDVQQKDBpDb2xsYWJvcmEgUHJvZHVjdGl2
-aXR5IEx0ZDEtMCsGA1UEAwwkQ29sbGFib3JhIENsb3VkU3VpdGUgSW50ZXJtZWRp
-YXRlIENBMSkwJwYJKoZIhvcNAQkBFhphbmRyYXMudGltYXJAY29sbGFib3JhLmNv
-bTAeFw0xNzA0MDMxMjEzNTVaFw0xODA0MTMxMjEzNTVaMIGXMQswCQYDVQQGEwJH
-QjEQMA4GA1UECAwHRW5nbGFuZDESMBAGA1UEBwwJQ2FtYnJpZGdlMSMwIQYDVQQK
-DBpDb2xsYWJvcmEgUHJvZHVjdGl2aXR5IEx0ZDESMBAGA1UEAwwJbG9jYWxob3N0
-MSkwJwYJKoZIhvcNAQkBFhphbmRyYXMudGltYXJAY29sbGFib3JhLmNvbTCCASIw
-DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANAKVQT9gmeBxYf/9eHexQ481jKq
-+rd7V+W9E4YPGHLmc6VJjojRFqE7VuXsQ1jvsEuB0XMyfkwm5VNMXfb9JFuRjZAT
-JdRlnf80+gBfXdme6GqjeBH/+Dm+6CEiV70UVRtspY+bMzdmkfwc6QFhbb1sTKyt
-FlhUg6OYdb3FKXk0o9ew1AcFyOsZIpW7UyCGEo3NC1I5SY4iwk4hwDYOY+opj2QC
-k1cQQ8CWpoonEvnwmUUbQ81W8diS7fMFqMouC8CFFKdqS1YafVlUUI8gDZOqvHC5
-ubBBMGL8IQi/YpaCzA0T9DLeF4lb/+9X6yeV8LCnFuh5UIabjMWj0OgNFLcCAwEA
-AaOCAXYwggFyMAkGA1UdEwQCMAAwEQYJYIZIAYb4QgEBBAQDAgZAMDMGCWCGSAGG
-+EIBDQQmFiRPcGVuU1NMIEdlbmVyYXRlZCBTZXJ2ZXIgQ2VydGlmaWNhdGUwHQYD
-VR0OBBYEFG4G7H4ECGBDbPK+0t8dmQpYWl9oMIHYBgNVHSMEgdAwgc2AFGkzufPW
-sHudzeh4tNd7xL54la5soYGwpIGtMIGqMQswCQYDVQQGEwJHQjEQMA4GA1UECAwH
-RW5nbGFuZDESMBAGA1UEBwwJQ2FtYnJpZGdlMSMwIQYDVQQKDBpDb2xsYWJvcmEg
-UHJvZHVjdGl2aXR5IEx0ZDElMCMGA1UEAwwcQ29sbGFib3JhIENsb3VkU3VpdGUg
-Um9vdCBDQTEpMCcGCSqGSIb3DQEJARYaYW5kcmFzLnRpbWFyQGNvbGxhYm9yYS5j
-b22CAhAAMA4GA1UdDwEB/wQEAwIFoDATBgNVHSUEDDAKBggrBgEFBQcDATANBgkq
-hkiG9w0BAQsFAAOCAgEAiv0KpnjXckgOwhceNrhUqfjaw5neolwyGEZ4gypn8E/g
-rKFOCstiL/sqw7nWcvK/guLvRwGj596KdTdX9yvIb3F/Q7PYy1VVHKKNcfyM4mgi
-QEKjGG98thTuGdtEluW+0gxRG3Piko6M9A4GXmRmeq8lq0fxSAvosDrSGO3iqRdZ
-f6/Oc3a1tBC+TwTxxOYOKN6EMKcEZpusPv/0+vaMbMvoMA7EJQq+AnuT6/jjXmmh
-89RGi9PxUohXwinY3VBTfY7qmWRJe2DUFpmSBdpk7cgttsmInff7bhM80ADGXTDQ
-AoPUgAh+vNpDBbjKsZbk71G+xVfJBmqdI+siM977TjbYbVuhVHvq9c/nmW0NXngL
-9TW8Q4kzDZvFpEAtnIaloqT5sHDfr8w4yyOi5miHl1wCkbw9h0TSMunItJ6NwXNO
-O0iq45qQw9Wks9Z0g/jRM3dbRZNsRPgYqOtRxNvZ9owdr75CUscMOA21sG8YCXAI
-8iOqu85YDPVsjhS0u3Mi2YTiVIX6I4noytTuYuzO4Popm1JdLBukVsNTvgRlOD03
-SbmrMCDFtw6+CEKsApjavrBA0iCIxuzUYnVjMtd6KitxoCZ/9zmm20rNIt+OPcLg
-XsiVguECIdSGyFIoEhjWEhgqPpOpSw/kx8s51zHEF9MvheImkHM4Cwd+M1n33a4=
+MIIDOjCCAiICCQCHrN8IV7MoFjANBgkqhkiG9w0BAQsFADBiMQswCQYDVQQGEwJE
+RTELMAkGA1UECAwCQlcxEjAQBgNVBAcMCVN0dXR0Z2FydDEYMBYGA1UECgwPRHVt
+bXkgQXV0aG9yaXR5MRgwFgYDVQQDDA9EdW1teSBBdXRob3JpdHkwHhcNMTgwNDE0
+MTU0ODM5WhcNNDMwNDE0MTU0ODM5WjBcMQswCQYDVQQGEwJERTELMAkGA1UECAwC
+QlcxEjAQBgNVBAcMCVN0dXR0Z2FydDEYMBYGA1UECgwPRHVtbXkgQXV0aG9yaXR5
+MRIwEAYDVQQDDAlsb2NhbGhvc3QwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK
+AoIBAQDVwrYlPGoBd7WbyJPukNkMPdUjZiHLQtOyKZNTiMC9kFpbIowJ/pVzqQdN
+Qqa/z6UpkspMV1sXlYxZAs6fGfqaaN/GNxGdS+P81O8x3KpwOmxQ/LgJKPn+Y2pt
+9n4tdC7WbVQbUJBLQ8nhd5NventHe0TXJ4Dsg1a3EzVxvJdkYTLzKikKeCrZ4+7R
+vEbZEEpxNJNCcrVrzifdiehG9BAuzp1AZ2/85RU8kRUckhXMQd0l4LRhdf3XxJmU
+15BRsqauvDEIOJhWBoil8aDy0k2qYxxixoB2z6VVsWnd5tY4Snieb74Y+aomXcAG
+2BZX1UH5Jnbvb9WTfnZixJWwuefBAgMBAAEwDQYJKoZIhvcNAQELBQADggEBAH5U
+07/DACeINcFcZBFhT1oo1mI5X3pSwiRjkedp/h3vMUhI8FuaufvWFJlrimnlwfcI
+kptRFOUW+m0ZM6IqhbKkY/DSKYA0fZo8BiHkjPkryIjlZ03GYsAA3KE4gobj5FAu
+QF94sxAVInagWyTY2yuR5jwhVJWXYCgs8sg5YEcfIm9ZkgFzinjPnVO6TIc4nLWQ
+Eb+FSD5xi6OA4N8D5kcvk6AGISks6rCSeO4HiGuVbxTeDY8KDddCZBiiiVoWF8iN
+Q9Hlxc5leShDSeGt0onB2Ntuvys2obDAFOQB94I1UiaKRqy5+o5oS4yevrmd4RVi
++VFRenC3csgVJ6XmUq4=
-----END CERTIFICATE-----
diff --git a/etc/key.pem b/etc/key.pem
index 93452dffd..294546c3b 100644
--- a/etc/key.pem
+++ b/etc/key.pem
@@ -1,27 +1,27 @@
-----BEGIN RSA PRIVATE KEY-----
-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
+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
-----END RSA PRIVATE KEY-----
commit 566e1ec1f89d86c0c259a5fd19aaefa653f6472b
Author: Andras Timar <andras.timar at collabora.com>
Date: Fri Feb 16 17:23:25 2018 +0100
tdf#115595 open editable documents with upper case or mixed case file extensions in edit mode
Change-Id: I6ea60926ce0ec4d1323080ffec5152d2bbeefc31
Reviewed-on: https://gerrit.libreoffice.org/49867
Reviewed-by: Andras Timar <andras.timar at collabora.com>
Tested-by: Andras Timar <andras.timar at collabora.com>
(cherry picked from commit 6a914ecbb95e565de51e33e4daeab3c78baeab2b)
Signed-off-by: Andras Timar <andras.timar at collabora.com>
diff --git a/wsd/LOOLWSD.hpp b/wsd/LOOLWSD.hpp
index ad858a4e4..722df0380 100644
--- a/wsd/LOOLWSD.hpp
+++ b/wsd/LOOLWSD.hpp
@@ -10,6 +10,7 @@
#ifndef INCLUDED_LOOLWSD_HPP
#define INCLUDED_LOOLWSD_HPP
+#include <algorithm>
#include <atomic>
#include <map>
#include <set>
@@ -89,10 +90,12 @@ public:
return LOOLWSD::SSLTermination.get();
}
- /// Return truee iff extension is marked as view action in discovery.xml.
+ /// Return true iff extension is marked as view action in discovery.xml.
static bool IsViewFileExtension(const std::string& extension)
{
- return EditFileExtensions.find(extension) == EditFileExtensions.end();
+ std::string lowerCaseExtension = extension;
+ std::transform(lowerCaseExtension.begin(), lowerCaseExtension.end(), lowerCaseExtension.begin(), ::tolower);
+ return EditFileExtensions.find(lowerCaseExtension) == EditFileExtensions.end();
}
/// Returns the value of the specified application configuration,
commit ff809473e7447b3069e80f53cd3bc69e4d3686aa
Author: Andras Timar <andras.timar at collabora.com>
Date: Sun Feb 18 00:24:08 2018 +0100
wsd: encode '#' character in file name
Change-Id: I4d10f38c9025f18a0d0f0f5599892b436b9d002c
Reviewed-on: https://gerrit.libreoffice.org/49919
Reviewed-by: Andras Timar <andras.timar at collabora.com>
Tested-by: Andras Timar <andras.timar at collabora.com>
(cherry picked from commit dde84d17064926f457b6ef7c6ebd9d595ac837b9)
Signed-off-by: Andras Timar <andras.timar at collabora.com>
diff --git a/wsd/DocumentBroker.cpp b/wsd/DocumentBroker.cpp
index 93d285f9c..4e3094b54 100644
--- a/wsd/DocumentBroker.cpp
+++ b/wsd/DocumentBroker.cpp
@@ -596,7 +596,11 @@ bool DocumentBroker::load(const std::shared_ptr<ClientSession>& session, const s
LOG_INF("SHA1 for DocKey [" << _docKey << "] of [" << localPath << "]: " <<
Poco::DigestEngine::digestToHex(sha1.digest()));
- _uriJailed = Poco::URI(Poco::URI("file://"), localPath);
+ // LibreOffice can't open files with '#' in the name
+ std::string localPathEncoded;
+ Poco::URI::encode(localPath,"#",localPathEncoded);
+ _uriJailed = Poco::URI(Poco::URI("file://"), localPathEncoded);
+
_filename = fileInfo._filename;
// Use the local temp file's timestamp.
More information about the Libreoffice-commits
mailing list