Build: #328 was successful
Job: Mac Build Workflow was successful
Code commits
Openfire (master)
-
daryl herzmann <akrherz@iastate.edu> 2d29bd295f583973ad55eea25fa28b2a4c78ad8e
Merge pull request #1444 from Fishbowler/improve_docker_build
Improve Dockerfile -
Dan Caseley <dan@caseley.me.uk> 15b76dca534d704c288a9266ef03c4f3f0aeeb83
Improve Dockerfile
* Include maven by default rather than installing
* Separate run steps for local caching- Dockerfile (version 15b76dca534d704c288a9266ef03c4f3f0aeeb83)
-
daryl herzmann <akrherz@iastate.edu> 844ab7605fb54f2e8488f7a3e1d30178bc49affd
Merge pull request #1438 from GregDThomas/OF-1821
OF-1821: Ensure that the ldap.pagedResultsSize is automatically set for ActiveDirectory -
daryl herzmann <akrherz@iastate.edu> 96652b038a82f72b1bfb92a174f2fcff40036ddb
Merge pull request #1431 from cpetzka/add_intellij_runtime_configuration
add debug instruction for IntelliJ IDEA to the README.md -
daryl herzmann <akrherz@iastate.edu> 2e1461a2d4a3bf21e69b8dc4644d155c7d80410c
Merge pull request #1430 from cpetzka/update_german_i18n_file
OF-1819 update the german translation -
daryl herzmann <akrherz@iastate.edu> df3f5e7dcb7cb444d699e9166fa2339523304722
Merge pull request #1436 from cpetzka/fix_can_not_insert_null_into_propvalue_under_oracle_db
OF-1828 Fix that an empty string can not be inserted in ofgroupporp.propvalue -
daryl herzmann <akrherz@iastate.edu> 8b4e42c45c386d9578fe6a8624746c514210706b
Merge pull request #1440 from guusdk/OF-1021_plugin-upload-file_extensions
OF-1021: Additional checks on (uploaded) plugin files -
daryl herzmann <akrherz@iastate.edu> 04cbd2b801d1fd92238deb64820aeb623b77afcb
Merge pull request #1441 from guusdk/OF-1192_Reflected-XSS-setup
OF-1192: Fixes Reflected XSS in LDAP Setup test -
daryl herzmann <akrherz@iastate.edu> d0382549599586b238ca6df2a39a2dbe8bb0f1bc
Merge pull request #1439 from GregDThomas/OF-1820
OF-1820: Ensure that groups are sorted -
daryl herzmann <akrherz@iastate.edu> 6bd1d231aae262f9e7a17d9a3482617fb7f2651a
Merge pull request #1435 from guusdk/OF-1826_Dataforms-NPE
OF-1826: Prevent NPE in new DataForms implementation. -
Guus der Kinderen 4a82a0e2219a71af8f0c5a7f528426170e345b2b
OF-1192: Fixes Reflected XSS in LDAP Setup test
The testing page for checking a a particular user (that's configured to be an Openfire admin) can be retrieved from LDAP contained an XSS vulnerability. This commit fixes that.
Many thanks to Luke Arntson for finding and reporting this issue.- xmppserver/src/main/webapp/setup/setup-admin-settings.jsp (version 4a82a0e2219a71af8f0c5a7f528426170e345b2b)
- xmppserver/src/main/webapp/setup/setup-admin-settings_test.jsp (version 4a82a0e2219a71af8f0c5a7f528426170e345b2b)
-
Guus der Kinderen 72cf4bf6dd5ea7df2ad4f60b8587b4cfcc579d63
OF-1021: Verify content type of uploaded plugins
Commit 9c62dbf599f266bde214c5a68a004708edc7da48 adds code that removes uploaded files that cannot be parsed as JAR files.
To further guard against malicous files being uploaded, this commit adds functionality to allow to verify the content type, as specified by the browser, of the uploaded file.
As a potential attacker is likely to be able to modify the reported content type. The added security value of this change is therefor not very signification. By default, this functionality is therefor disabled, to prevent valid use cased from being stopped by this.
The new functionality is controlled by two new properties:
- plugins.upload.content-type-check.enabled A boolean value that enables or disables the check (defaults to false).
- plugins.upload.content-type-check.expected-value Text value that is the expected content type (defaults to application/x-java-archive).- xmppserver/src/main/webapp/plugin-admin.jsp (version 72cf4bf6dd5ea7df2ad4f60b8587b4cfcc579d63)
-
Guus der Kinderen 28972842d1d4147e018959d790dd1e9d22a540c7
OF-1021: Verify magic bytes of uploaded plugins
Commit 9c62dbf599f266bde214c5a68a004708edc7da48 adds code that removes uploaded files that cannot be parsed as JAR files.
To further guard against malicous files being uploaded, this commit verifies the magic bytes (the first few bytes) of the uploaded file.
The new functionality is controlled by two new properties:
- plugins.upload.magic-number-check.enabled A boolean value that enables or disables the check (defaults to true).
- plugins.upload.magic-number.values.expected-value A list of hex representations of valid magic byte sequences (defaults to "504B0304", "504B0506", "504B0708").- i18n/src/main/resources/openfire_i18n.properties (version 28972842d1d4147e018959d790dd1e9d22a540c7)
- xmppserver/src/main/java/org/jivesoftware/openfire/container/PluginManager.java (version 28972842d1d4147e018959d790dd1e9d22a540c7)
- xmppserver/src/test/java/org/jivesoftware/openfire/container/PluginManagerTest.java (version 28972842d1d4147e018959d790dd1e9d22a540c7)
- xmppserver/src/test/resources/hello.jar (version 28972842d1d4147e018959d790dd1e9d22a540c7)
-
Guus der Kinderen f1a8ec1f641117c0570e0d6471f63828bc419394
Fixed logged messages.
- xmppserver/src/main/java/org/jivesoftware/openfire/container/PluginManager.java (version f1a8ec1f641117c0570e0d6471f63828bc419394)
-
Guus der Kinderen 368db057c0a33b65598c77dc7f8eea8bef1d5c11
OF-1021: Verify JAR content
Commit 9c62dbf599f266bde214c5a68a004708edc7da48 adds code that removes uploaded files that cannot be parsed as JAR files.
To further guard against malicous files being uploaded, this commit verifies that the uploaded JAR file contains a 'plugin.xml' entry.
The new functionality is controlled by two new properties:
- plugins.upload.pluginxml-check.enabled A boolean value that enables or disables the check (defaults to true).- i18n/src/main/resources/openfire_i18n.properties (version 368db057c0a33b65598c77dc7f8eea8bef1d5c11)
- xmppserver/src/main/java/org/jivesoftware/openfire/container/PluginManager.java (version 368db057c0a33b65598c77dc7f8eea8bef1d5c11)
-
Greg Thomas <greg.d.thomas@gmail.com> ef1c1efe68b5652901d964a7e4817bd33db0479f
OF-1820: Ensure that groups are sorted
- xmppserver/src/main/webapp/group-edit.jsp (version ef1c1efe68b5652901d964a7e4817bd33db0479f)
-
Greg Thomas <greg.d.thomas@gmail.com> a32129a18a0233289bd94590958cb3833aef36b4
OF-1821: Ensure that the ldap.pagedResultsSize is automatically set for ActiveDirectory.
- i18n/src/main/resources/openfire_i18n.properties (version a32129a18a0233289bd94590958cb3833aef36b4)
- xmppserver/src/main/java/org/jivesoftware/openfire/ldap/LdapManager.java (version a32129a18a0233289bd94590958cb3833aef36b4)
- xmppserver/src/main/webapp/setup/ldap-user.jspf (version a32129a18a0233289bd94590958cb3833aef36b4)
- xmppserver/src/test/java/org/jivesoftware/util/LDAPTest.java (version a32129a18a0233289bd94590958cb3833aef36b4)
-
daryl herzmann <akrherz@iastate.edu> d6a73723c807ef73d7b550e31cec2e257e33e65c
Merge pull request #1437 from guusdk/OF-1827_SSLContext-config
OF-1827: Make SSLContext protocol configurable -
Guus der Kinderen d5e9a0a75f108728c0173d86dab4b395500193c3
OF-1827: Make SSLContext protocol configurable
This commit removes the hardcoded TLSv1 protocol that was used to initialize most SSLContexts. It is replaces by a Java-provided default, which can be overridden by a new property, xmpp.auth.ssl.context_protocol.- i18n/src/main/resources/openfire_i18n.properties (version d5e9a0a75f108728c0173d86dab4b395500193c3)
- xmppserver/src/main/java/org/jivesoftware/openfire/spi/EncryptionArtifactFactory.java (version d5e9a0a75f108728c0173d86dab4b395500193c3)
- xmppserver/src/main/java/org/jivesoftware/util/SimpleSSLSocketFactory.java (version d5e9a0a75f108728c0173d86dab4b395500193c3)
-
akrherz <akrherz@iastate.edu> 0e23ecbc7a3823c235af5e9c3a97cf8a02a4e4d5
OF-1825: remove redundant documentation from RPM
- build/rpm/openfire.spec (version 0e23ecbc7a3823c235af5e9c3a97cf8a02a4e4d5)
-
akrherz <akrherz@iastate.edu> 0059d60e9fc8fe70751c7c43373159d1b3ee14c8
MNT: add rpmbuild opt to ignore binary files in noarch
- build/rpm/openfire.spec (version 0059d60e9fc8fe70751c7c43373159d1b3ee14c8)
-
cpetzka <31418387+cpetzka@users.noreply.github.com> 30ad0068207e1fdc8ad62b6756bfb87a83d23d7c
Fix that an empty string can not be inserted in ofgroupporp.propvalue
- distribution/src/database/openfire_oracle.sql (version 30ad0068207e1fdc8ad62b6756bfb87a83d23d7c)
-
Guus der Kinderen 393517209f711a831832552cb2338d6bad764a0d
OF-1826: Prevent NPE in new DataForms implementation.
The implementation introduced by OF-1809 causes collections of DataForm instances to be processed.
The new contract defines that a set must be present - null values are not allowed.
It's easy to overlook this new contract. For example, our own code returned a null value, instead of an empty collection.
This commit modifies the return of a null value (it now returns an empty value). Additionally, this PR adds a guard for problems like this, by explicitly checking of a value is null.- xmppserver/src/main/java/org/jivesoftware/openfire/disco/IQDiscoInfoHandler.java (version 393517209f711a831832552cb2338d6bad764a0d)
-
cpetzka <31418387+cpetzka@users.noreply.github.com> 577448edfa2e8f8b2abd9d27fa5b46ff9a2bb2a3
add debug instruction for IntelliJ IDEA to the README.md
- README.md (version 577448edfa2e8f8b2abd9d27fa5b46ff9a2bb2a3)
-
cpetzka <31418387+cpetzka@users.noreply.github.com> 337c4dca886b03bbe157dc54db36a414cfd57827
update the german translation
- i18n/src/main/resources/openfire_i18n_de.properties (version 337c4dca886b03bbe157dc54db36a414cfd57827)
-
balavihar <pbalavihar@gmail.com> fdaf7b485b075363acd8f12ebeeb9306076bdbe0
In Sybase every column should be defined NONNULL/NULL constraint, observed some columns without NONNULL/NULL, fixed by adding NULL to columns. Semicolons are removed because it stopping script to execute in Sybase. Corrected some datatypes which are not supporting for Sybase. Column name "serviceID" is corrected in index "ofMucRoom_serviceid_idx"
- distribution/src/database/openfire_sybase.sql (version fdaf7b485b075363acd8f12ebeeb9306076bdbe0)
- distribution/src/database/upgrade/26/openfire_sybase.sql (version fdaf7b485b075363acd8f12ebeeb9306076bdbe0)
- distribution/src/database/upgrade/27/openfire_sybase.sql (version fdaf7b485b075363acd8f12ebeeb9306076bdbe0)
- distribution/src/database/upgrade/28/openfire_sybase.sql (version fdaf7b485b075363acd8f12ebeeb9306076bdbe0)
- distribution/src/database/upgrade/29/openfire_sybase.sql (version fdaf7b485b075363acd8f12ebeeb9306076bdbe0)
- distribution/src/database/upgrade/30/openfire_sybase.sql (version fdaf7b485b075363acd8f12ebeeb9306076bdbe0)
-
Guus der Kinderen c5db97e0f90e0af5233bd01c14394405a2d717e2
OF-1815: Add MUC search 'muclumbus' support.
This commit adds support for the search functionality as described on and used by https://search.jabbercat.org/- i18n/src/main/resources/openfire_i18n.properties (version c5db97e0f90e0af5233bd01c14394405a2d717e2)
- xmppserver/src/main/java/org/jivesoftware/openfire/muc/spi/IQMuclumbusSearchHandler.java (version c5db97e0f90e0af5233bd01c14394405a2d717e2)
- xmppserver/src/main/java/org/jivesoftware/openfire/muc/spi/MultiUserChatServiceImpl.java (version c5db97e0f90e0af5233bd01c14394405a2d717e2)
- xmppserver/src/main/java/org/jivesoftware/util/StringUtils.java (version c5db97e0f90e0af5233bd01c14394405a2d717e2)
- xmppserver/src/test/java/org/jivesoftware/util/StringUtilsTest.java (version c5db97e0f90e0af5233bd01c14394405a2d717e2)
-
cpetzka <31418387+cpetzka@users.noreply.github.com> 962d321dc8ef5fdfd3057a1a0b5a46d104fa1310
fix a ClassCastException in LocalMUCRoom.java
- xmppserver/src/main/java/org/jivesoftware/openfire/muc/HistoryRequest.java (version 962d321dc8ef5fdfd3057a1a0b5a46d104fa1310)
- xmppserver/src/main/java/org/jivesoftware/openfire/muc/MUCRoom.java (version 962d321dc8ef5fdfd3057a1a0b5a46d104fa1310)
- xmppserver/src/main/java/org/jivesoftware/openfire/muc/spi/LocalMUCRoom.java (version 962d321dc8ef5fdfd3057a1a0b5a46d104fa1310)
-
Guus der Kinderen 5ad000567ff2ecb1c6d73304f8a30b4f822c40d4
Fix typo
- xmppserver/src/main/java/org/jivesoftware/openfire/XMPPServer.java (version 5ad000567ff2ecb1c6d73304f8a30b4f822c40d4)
-
cpetzka <31418387+cpetzka@users.noreply.github.com> 46c253413c462344de1c5600fe771f91ecbf80e3
use java's try-with-resource in log.jsp instead of manually close streams
- xmppserver/src/main/webapp/log.jsp (version 46c253413c462344de1c5600fe771f91ecbf80e3)
-
cpetzka <31418387+cpetzka@users.noreply.github.com> b20db499aa377346a7c70e16463233b78a8d30eb
fix code formatting
- xmppserver/src/main/webapp/log.jsp (version b20db499aa377346a7c70e16463233b78a8d30eb)
-
cpetzka <31418387+cpetzka@users.noreply.github.com> 76b41da3ac2faa529ddc41f34c43cd6c1431d55c
close input streams in log.jsp correctly
- xmppserver/src/main/webapp/log.jsp (version 76b41da3ac2faa529ddc41f34c43cd6c1431d55c)
-
mnsuccess <ngudiamanasse@gmail.com> 3de2bb3eda4b33ae84474f0d7aca56255c7cdf0b
OF-1809 improve code method getFirstDataForm
- xmppserver/src/main/java/org/jivesoftware/openfire/disco/IQDiscoInfoHandler.java (version 3de2bb3eda4b33ae84474f0d7aca56255c7cdf0b)
-
mnsuccess <ngudiamanasse@gmail.com> ec882442dede4d66acf843c031d961da8356e8e7
OF-1809 IQOfflineMessagesHandler add getExtendedInfos method to allow more than DataForm
- xmppserver/src/main/java/org/jivesoftware/openfire/handler/IQOfflineMessagesHandler.java (version ec882442dede4d66acf843c031d961da8356e8e7)
-
mnsuccess <ngudiamanasse@gmail.com> 04541e37010007eb56d749222e0261a01544bbad
OF-1809 improve code method getFirstDataForm try-catch
- xmppserver/src/main/java/org/jivesoftware/openfire/disco/IQDiscoInfoHandler.java (version 04541e37010007eb56d749222e0261a01544bbad)
-
mnsuccess <ngudiamanasse@gmail.com> e88fa2c14136eda035452c76b8fe3d77e79ccb17
OF-1809 add Unit Test other methods
- xmppserver/src/main/java/org/jivesoftware/openfire/disco/IQDiscoInfoHandler.java (version e88fa2c14136eda035452c76b8fe3d77e79ccb17)
- xmppserver/src/test/java/org/jivesoftware/openfire/disco/IQDiscoInfoHandlerTest.java (version e88fa2c14136eda035452c76b8fe3d77e79ccb17)
-
mnsuccess <ngudiamanasse@gmail.com> ab85586de875198654c5b1f416fef73dbf6fdb0b
OF-1809 MultiUserChatServiceImpl add getExtendedInfos method to allow more than DataForm
- xmppserver/src/main/java/org/jivesoftware/openfire/muc/spi/MultiUserChatServiceImpl.java (version ab85586de875198654c5b1f416fef73dbf6fdb0b)
-
mnsuccess <ngudiamanasse@gmail.com> 74882b048b4ae711ee0aa2aebea68b1fde3f9eaf
OF-1809 add getExtendedInfos method to allow more than one DataForm
- xmppserver/src/main/java/org/jivesoftware/openfire/disco/IQDiscoInfoHandler.java (version 74882b048b4ae711ee0aa2aebea68b1fde3f9eaf)
- xmppserver/src/main/java/org/jivesoftware/openfire/pep/IQPEPHandler.java (version 74882b048b4ae711ee0aa2aebea68b1fde3f9eaf)
-
mnsuccess <ngudiamanasse@gmail.com> e90ef27223b951fe777088aaf25efeec68c15ee5
OF-1809 Improve code
- xmppserver/src/main/java/org/jivesoftware/openfire/filetransfer/DefaultFileTransferManager.java (version e90ef27223b951fe777088aaf25efeec68c15ee5)
-
mnsuccess <ngudiamanasse@gmail.com> e5472a6c68e0a5ea95c81ae339ac5ab4a3efa14d
OF-1809 add getExtendedInfos method to allow more than one DataForm
- xmppserver/src/main/java/org/jivesoftware/openfire/commands/AdHocCommandHandler.java (version e5472a6c68e0a5ea95c81ae339ac5ab4a3efa14d)
-
mnsuccess <ngudiamanasse@gmail.com> 6eff92018a74d0a288913bbffc9bbb6906e2d558
OF-1809 Enabled IQDiscoInfoHandler to respond with more than one XDataForm
- xmppserver/src/main/java/org/jivesoftware/openfire/disco/IQDiscoInfoHandler.java (version 6eff92018a74d0a288913bbffc9bbb6906e2d558)
-
mnsuccess <ngudiamanasse@gmail.com> 25e17cd2f77b365b83feb4c58ed9ad8d2e8ff910
OF-1809 PubSubModule add getExtendedInfos method to allow more than one DataForm
- xmppserver/src/main/java/org/jivesoftware/openfire/pubsub/PubSubModule.java (version 25e17cd2f77b365b83feb4c58ed9ad8d2e8ff910)
-
mnsuccess <ngudiamanasse@gmail.com> 48cae3c9eec9e6a2e6cf5124a817474679b830ca
OF-1809 Allow Openfire to include more then one XDataForm
- xmppserver/src/main/java/org/jivesoftware/openfire/disco/DiscoInfoProvider.java (version 48cae3c9eec9e6a2e6cf5124a817474679b830ca)
-
mnsuccess <ngudiamanasse@gmail.com> 0c839ad3dd38b97144e89236f65d1c3d1a2cc2d0
OF-1809 return an empty collection, instead of a collection that contains a null value.
- xmppserver/src/main/java/org/jivesoftware/openfire/disco/DiscoInfoProvider.java (version 0c839ad3dd38b97144e89236f65d1c3d1a2cc2d0)
- xmppserver/src/main/java/org/jivesoftware/openfire/disco/IQDiscoInfoHandler.java (version 0c839ad3dd38b97144e89236f65d1c3d1a2cc2d0)
-
mnsuccess <ngudiamanasse@gmail.com> 8505bfbdde74a945a78aac5504ce96bd03adc0f7
OF-1809 add Unit Test (IQDiscoInfoHandlerTest)
- xmppserver/src/main/java/org/jivesoftware/openfire/disco/IQDiscoInfoHandler.java (version 8505bfbdde74a945a78aac5504ce96bd03adc0f7)
- xmppserver/src/test/java/org/jivesoftware/openfire/disco/IQDiscoInfoHandlerTest.java (version 8505bfbdde74a945a78aac5504ce96bd03adc0f7)
-
mnsuccess <ngudiamanasse@gmail.com> 27e55a3bebbe9f93967d3ff0959a95bdc6a9c01f
OF-1809 FileTransferProxy add getExtendedInfos method to allow more than DataForm
- xmppserver/src/main/java/org/jivesoftware/openfire/filetransfer/proxy/FileTransferProxy.java (version 27e55a3bebbe9f93967d3ff0959a95bdc6a9c01f)
-
mnsuccess <ngudiamanasse@gmail.com> 4ac36ac5ad4e27c915db924ed76de24f34a57c39
OF-1809 improve code method getFirstDataForm
- xmppserver/src/main/java/org/jivesoftware/openfire/disco/IQDiscoInfoHandler.java (version 4ac36ac5ad4e27c915db924ed76de24f34a57c39)
-
mnsuccess <ngudiamanasse@gmail.com> d98afc18066bdf0e053199b251e293c1826345d4
OF-1809 MediaProxyService add getExtendedInfos method to allow more than DataForm
- xmppserver/src/main/java/org/jivesoftware/openfire/mediaproxy/MediaProxyService.java (version d98afc18066bdf0e053199b251e293c1826345d4)
-
mnsuccess <ngudiamanasse@gmail.com> e0c97d3ee4a39770cd979e4d44932eab89fe2d2a
OF-1809 Improve code
- xmppserver/src/main/java/org/jivesoftware/openfire/commands/AdHocCommandHandler.java (version e0c97d3ee4a39770cd979e4d44932eab89fe2d2a)
- xmppserver/src/main/java/org/jivesoftware/openfire/disco/IQDiscoInfoHandler.java (version e0c97d3ee4a39770cd979e4d44932eab89fe2d2a)
- xmppserver/src/main/java/org/jivesoftware/openfire/filetransfer/DefaultFileTransferManager.java (version e0c97d3ee4a39770cd979e4d44932eab89fe2d2a)
- xmppserver/src/main/java/org/jivesoftware/openfire/filetransfer/proxy/FileTransferProxy.java (version e0c97d3ee4a39770cd979e4d44932eab89fe2d2a)
- xmppserver/src/main/java/org/jivesoftware/openfire/mediaproxy/MediaProxyService.java (version e0c97d3ee4a39770cd979e4d44932eab89fe2d2a)
- xmppserver/src/main/java/org/jivesoftware/openfire/muc/spi/MultiUserChatServiceImpl.java (version e0c97d3ee4a39770cd979e4d44932eab89fe2d2a)
- xmppserver/src/main/java/org/jivesoftware/openfire/pep/IQPEPHandler.java (version e0c97d3ee4a39770cd979e4d44932eab89fe2d2a)
- xmppserver/src/main/java/org/jivesoftware/openfire/pubsub/PubSubModule.java (version e0c97d3ee4a39770cd979e4d44932eab89fe2d2a)
-
mnsuccess <ngudiamanasse@gmail.com> aa0773038d185c6655bdd6797092e3aeafd9eeef
OF-1809 improve code method getFirstDataForm
- xmppserver/src/main/java/org/jivesoftware/openfire/disco/IQDiscoInfoHandler.java (version aa0773038d185c6655bdd6797092e3aeafd9eeef)
-
Guus der Kinderen 3ade2c14b34872dcd0f6db36f2009b6a555a1746
Travis: explicitly define distribution
Recently, the default distribution used by Travis was changed from 'trusty' to 'xenial'. See https://blog.travis-ci.com/2019-04-15-xenial-default-build-environment
In Xenial, oraclejdk8 is not available (although openjdk8 is).
Openfire depends on oraclejdk8. This commit explicitly defines 'trusty' to be used, which should make oraclejdk8 available again.- .travis.yml (version 3ade2c14b34872dcd0f6db36f2009b6a555a1746)
-
Greg Thomas <greg.d.thomas@gmail.com> 2979e2029c5aa416493a7015f32575532841a712
Create some tests before changing any code
- xmppserver/src/test/java/org/jivesoftware/openfire/group/GroupManagerTest.java (version 2979e2029c5aa416493a7015f32575532841a712)
-
Greg Thomas <greg.d.thomas@gmail.com> a04e76b114905c571c02d1e026193bbf552cc90d
Refactor getGroup()
- xmppserver/src/main/java/org/jivesoftware/openfire/group/GroupManager.java (version a04e76b114905c571c02d1e026193bbf552cc90d)