summaryrefslogtreecommitdiffstats
path: root/datafile-app-server/src
AgeCommit message (Collapse)AuthorFilesLines
2021-07-21DFC security vulnerability updates1.6.0Joanna Jeremicz1-1/+16
- tomcat-embed-core: 9.0.39 -> 9.0.50 - spring: 5.3.1 -> 5.3.6 - spring-boot: 2.4.0 -> 2.4.5 Issue-ID: DCAEGEN2-2804 Signed-off-by: Joanna Jeremicz <joanna.jeremicz@nokia.com> Change-Id: I59568543048602a21ff6e89b44bbb57c5351688a
2021-04-30Change openjdk baseOS img to integration-java11Alexander Mazuruk1-14/+16
Since 7.2.0 integration images switched over to alpine, adjusted Dockerfile to accomodate the switch. Removed vim & curl as they didn't seem to be used. Same with .ssh directory. Chowned config files and adjusted file permissions to u+rw (I assume configs dont need exec permissions) Benefits from switching over: * minimal {java11,python} images maintained by integration team * using currently "blessed by seccom" versions (:latest tag used) * should limit spread of legal issues across layers * integration images will be the first to have automated compliance documentation * should limit spread of base layers (contributing to deployment footprint - more base layers = more to download, more to store etc...) Issue-ID: INT-1864 Issue-ID: DCAEGEN2-2420 Signed-off-by: Alexander Mazuruk <a.mazuruk@samsung.com> Change-Id: Ic2d55ef33785fa048ee755d34eef94120124a7eb
2021-03-09Fix server hostname verification1.5.5Krzysztof Gajewski10-34/+62
- make it configurable - some small another sonar issues resolved Issue-ID: DCAEGEN2-2656 Signed-off-by: Krzysztof Gajewski <krzysztof.gajewski@nokia.com> Change-Id: I3012b60dbdfdb463d5adfd790df53953fe1f027f
2021-02-23Add JWT support in HTTP/HTTPS based locations1.5.4Krzysztof Gajewski10-62/+514
Issue-ID: DCAEGEN2-2536 Signed-off-by: Krzysztof Gajewski <krzysztof.gajewski@nokia.com> Change-Id: I47a928159853333014b0fd413a085b7c50eeb7a0
2021-02-11Add HTTPS to collect files from xNFs1.5.3Krzysztof Gajewski26-92/+1093
- plus small refactoring related to above - update to version 1.5.3 Issue-ID: DCAEGEN2-2528 Signed-off-by: Krzysztof Gajewski <krzysztof.gajewski@nokia.com> Change-Id: I2531c85967964f1359bafd5b694afbf662edf54e
2021-02-08[DCAE-dfc] Vulnerability Removal for Datafile Collectorajay_dp0014-76/+33
- swagger version 2.9.2 to 3.0.0 - commons-io version 1.3.2 to 2.8.0 - tomcat-embed-core version 9.0.36 to 9.0.39 - pom.xml refactoring Issue-ID: DCAEGEN2-2591 Signed-off-by: ajay_dp001 <ajay.deep.singh@est.tech> Change-Id: I40e65a6936fc118299cd575df34c51730a25f424
2020-12-30Add HTTP as new protocol to collect files from xNFsKrzysztof Gajewski20-25/+517
- HTTP basic auth included - small code refactoring related to the task Issue-ID: DCAEGEN2-2527 Signed-off-by: Krzysztof Gajewski <krzysztof.gajewski@nokia.com> Change-Id: I13ec80e996861e14d2c561087c4af3b34d861030
2020-12-02Upgrade Reactor and SpringBoot1.5.0tkogut13-92/+89
Issue-ID: DCAEGEN2-2537 Signed-off-by: tkogut <tomasz.kogut@nokia.com> Change-Id: Ide560554f11d01737b351d6138430efe6005791d
2020-08-25Update dcae SDK from 1.1.6 to 1.4.2Remigiusz Janeczek26-876/+357
Bump project version from 1.4.2 to 1.4.3 Update deprecated calls to JsonParser Make logs always go to file and console Issue-ID: DCAEGEN2-2267 Signed-off-by: Remigiusz Janeczek <remigiusz.janeczek@nokia.com> Change-Id: Ib8d7f82b3daf03ca327581c9a5dc4f6f27a20141
2020-08-03openJDK image update to 11.0.8deen19851-1/+1
Change-Id: I341390e5bde3e894455ac7717990669f4e0f0f94 Signed-off-by: deen1985 <damian.nowak@nokia.com> Issue-ID: DCAEGEN2-2378 Signed-off-by: deen1985 <damian.nowak@nokia.com>
2020-07-30Removed support for FTPS protocol (from now only FTPeS and sFTP will be ↵Jan Malkiewicz11-67/+74
supported). Issue-ID: DCAEGEN2-2367 Signed-off-by: Jan Malkiewicz <jan.malkiewicz@nokia.com> Change-Id: Ifada2899431c56bdbfcf3aad73fdc9b376ae9c4f
2020-07-29Merge "Add log when file is skipped because it was already published"Henrik Andersson1-9/+18
2020-07-28Add log when file is skipped because it was already publishedRemigiusz Janeczek1-9/+18
Issue-ID: DCAEGEN2-2366 Signed-off-by: Remigiusz Janeczek <remigiusz.janeczek@nokia.com> Change-Id: I913b887833e412dd9c0093936a9231d37f63e7d1
2020-07-28Add sftp strict host key checking to DFC.Jan Malkiewicz15-82/+333
Issue-ID: DCAEGEN2-2219 Signed-off-by: Jan Malkiewicz <jan.malkiewicz@nokia.com> Change-Id: Iadf6c6bd743c42ebb3bf9ad8ac443fc0f3f58063
2020-07-23Update to Java 11JoeOLeary1-3/+3
minor version bump to 1.4.0 Issue-ID: DCAEGEN2-1691 Signed-off-by: JoeOLeary <joseph.o.leary@est.tech> Change-Id: Iaf9e8fdcf469fe79c63e8e3868b18168a60a7f2c
2019-10-16DataFileCollector use wrong KeyManagerFactoryburdziak3-17/+34
Issue-ID: DCAEGEN2-1854 Signed-off-by: burdziak <olaf.burdziakowski@nokia.com> Change-Id: I71c7526097014e10d0ef091e38a929b81ba1f627
2019-09-18Personalized client certificate authentication via FTPes in 5G Bulk PM ↵burdziak2-0/+33
usecase doesn't work Issue-ID: DCAEGEN2-1754 Signed-off-by: burdziak <olaf.burdziakowski@nokia.com> Change-Id: Idec3efce8412dd175ecf75f55790a24cec651104
2019-09-10update Dockerfile & copyrigt statementecaiyanlinux2-2/+3
Issue-ID: DCAEGEN2-1702 Change-Id: If990e180b96f943dd7381a758c11d10e4733706c Signed-off-by: Martin Yan <martin.c.yan@est.tech>
2019-09-06TLS init container usageecaiyanlinux14-46/+60
Change-Id: Iec51c722f6a3a519fd7eb0f37f8b801eebbc039b Issue-ID: DCAEGEN2-1702 Signed-off-by: ecaiyanlinux <martin.c.yan@est.tech>
2019-08-12DFC HousekeepingPatrikBuhr18-150/+99
Removed warnings. Improved code formatting Removed unused files Removed datafile_endpoints.json from the container Change-Id: I7334775be793cd9cb709ca1e031c620c2c1c2b3f Issue-ID: DCAEGEN2-1645 Signed-off-by: PatrikBuhr <patrik.buhr@est.tech>
2019-07-12Cbs Client integrationYongchaoWu24-331/+366
Cbs Client is integrated to read configurations from consul Issue-ID: DCAEGEN2-1595 Change-Id: Idb0ebd34eba077f9c1cb584abab4d8722b56f6c5 Signed-off-by: YongchaoWu <yongchao.wu@est.tech>
2019-07-02DFC - housekeepingelinuxhenrik21-146/+655
Removed Sonar warnings. Improved code coverage. Improved code formatting Change-Id: I0e8287cecb18a8976635427697dfaeb823da204b Issue-ID: DCAEGEN2-1645 Signed-off-by: elinuxhenrik <henrik.b.andersson@est.tech>
2019-06-14Code formatting with mavenPatrikBuhr50-1081/+1104
This commit only contains code formastting changes done by command: mvn formatter:format spotless:apply process-sources Change-Id: I0fb9d166ad5d9171cdeee9f26b6d353bca74069c Issue-ID: DCAEGEN2-1538 Signed-off-by: PatrikBuhr <patrik.buhr@est.tech>
2019-06-14Bugfix, improved behaviour for large filesPatrikBuhr14-97/+300
Previously files was read into a buffer for publishing. This does not work when files are bigger than the available memory. After the fix , files are streamed instead. Implemented a new REST primitive for exposing status and statistics. To be used for test and trouble shooting. Change-Id: Iab5a1ee9ffcbf6836fcf709d115bf25ab0391732 Issue-ID: DCAEGEN2-1532 Signed-off-by: PatrikBuhr <patrik.buhr@est.tech>
2019-06-05Datafile - Improve JUnit testselinuxhenrik21-249/+485
Improve JUnit tests for the Datafile Collector. Add tests of logging. Remove dependency to old JUnit version. Improve some log messages. Improve code coverage. Change-Id: Ie8204619ab7fe4294c4ac0dd8f030973653ef4a3 Issue-ID: DCAEGEN2-1490 Signed-off-by: elinuxhenrik <henrik.b.andersson@est.tech>
2019-06-04Merge "Bugfixes, Generalizing Data File Collection to handle any type of file"Henrik Andersson1-9/+7
2019-06-03Bugfixes, Generalizing Data File Collection to handle any type of filePatrikBuhr1-9/+7
- When a change ID was not configured, the task counter was not decreased. The result was that the DFC stopped polling, - When the check if a file is a already published fails (most likely to a problem is the DR), the DFC will try to publish it (instead of just ingnoring it). Change-Id: If9f5b962210f809d5d2ae0aa60d3a7f99099c058 Issue-ID: DCAEGEN2-1532 Signed-off-by: PatrikBuhr <patrik.buhr@est.tech>
2019-06-03DFC, Purging the cache of published files occasionally failsPatrikBuhr1-5/+5
Solved a threading issue. Change-Id: I1272cadd5d8bc8bb8ffc4c3d33c9b5c706470864 Issue-ID: DCAEGEN2-1588 Signed-off-by: PatrikBuhr <patrik.buhr@est.tech>
2019-05-29Generalizing Data File Collection to handle any type of filePatrikBuhr41-914/+1054
Extension of the DFC to be able to handle any file types types, which are published on different DR feeds. This association between file type and DR feed is defined by configuration. The file type is defined by the changeIdentifier in the fileReady VES message reported from the PNF. The creation of DR feeds and configuration will be done by the DMAAP plugin, but that is not tested yet. Change-Id: I13b36acd926a6941ee733e6b37922049fb54a5d9 Issue-ID: DCAEGEN2-1532 Signed-off-by: PatrikBuhr <patrik.buhr@est.tech>
2019-05-22Merge "Fix for robustness"Henrik Andersson3-9/+16
2019-05-17Fix, skip FTP retry in certain casesPatrikBuhr7-13/+77
In certain conditions there is no reason to retry fetching files. For instance when the file is removed in the PNF or when the password/certificate is wrong. When the DFC is started there are always queued VES events that referes to removed files which in turn results in that the DFC will retry fetching these files in vain. The DFC house keeps its number of concurrents tasks to not exeed quotas for memory,open file descriptors etc. As more threads are occupied with retrying, the fewer threads can do their intended work, which decreases the throughput. Testing has showed that already when the number of PNFs are 10, the throughput is radically decreased (and the problem is then escalating). Change-Id: I4833724a3ef3509025f4a0a438c6c8025932b0f4 Issue-ID: DCAEGEN2-1508 Signed-off-by: PatrikBuhr <patrik.buhr@est.tech>
2019-05-17Fix for robustnessPatrikBuhr3-9/+16
In the long time stability test it has showed that when there are an exessive amount of FileReady events, the DFC will fetch these from the MR and build up an internal queue. This has the effect that the DFC will consume too much memory. Itmight also affect load balancing (in case of several DFC instances) so that one might consume all events and the others get nothing. The DFC should not fetch new FileReady events when it fully loaded with work. Change-Id: I58665edd678d2f1c8a32d0e56455228b522aab40 Issue-ID: DCAEGEN2-1509 Signed-off-by: PatrikBuhr <patrik.buhr@est.tech>
2019-05-13Bugfix: add MDC context to http redirect logsRehanRaza4-9/+32
Change-Id: Icdf00480eed43536a8b4693cbb208560f0881c95 Issue-ID: DCAEGEN2-1462 Signed-off-by: RehanRaza <muhammad.rehan.raza@est.tech>
2019-05-08Code improvement, FilePublishInformation serializingPatrikBuhr5-94/+36
Updated serializer of FilePublishInformation so that only elements that should be part of publishing is included. Change-Id: If5632af8bf9fd26f8bc96b25d8bfbccf63dfec2f Issue-ID: DCAEGEN2-1488 Signed-off-by: PatrikBuhr <patrik.buhr@est.tech>
2019-05-07Merge "Bugfix, trace context"Henrik Andersson1-4/+2
2019-05-05Ownership fix in config directoryTamasBakai1-1/+1
Change-Id: Iec3ca75c42642da27c52bccd6d60811c434f778a Issue-ID: DCAEGEN2-1466 Signed-off-by: TamasBakai <tamas.bakai@est.tech>
2019-05-02Bugfix, trace contextPatrikBuhr1-4/+2
When retrying of file publish, the RequestID in the trace context is incorect. The context must be expicitly updated since retrying is executed in a separate thread. Change-Id: I1c5dc0ba0e53c1219e23f93d8c5b420996a16c93 Issue-ID: DCAEGEN2-1462 Signed-off-by: PatrikBuhr <patrik.buhr@est.tech>
2019-04-25Extend Swagger for actuator end-points also1.1.21.1.1TamasBakai1-10/+12
Change-Id: Ia036f7d79d25ceb2f1e465d79f17db1acbabbfbf Issue-ID: DCAEGEN2-1443 Signed-off-by: TamasBakai <tamas.bakai@est.tech>
2019-04-16Bugfix, serializing in DataRouterPublisherPatrikBuhr2-1/+8
This fixes a bug introduced in c7b0c7014688c447d411f791a094440403e65228. The new property must be removed before publishing to data router. The consequense of the bug is that the DR rejects the publishing. Change-Id: Ib42cbed4decdba4c13678cea47dff35ca77679a5 Issue-ID: DCAEGEN2-1305 Signed-off-by: PatrikBuhr <patrik.buhr@est.tech>
2019-04-12Improved loggingPatrikBuhr12-102/+169
File name is used in Requext_ID to make it more easy to trouble shoot. Change-Id: Ied98766f1a177a9bda35ec5892a60d06619ff3a7 Issue-ID: DCAEGEN2-1305 Signed-off-by: PatrikBuhr <patrik.buhr@est.tech>
2019-04-12Fixed build problemsPatrikBuhr1-1/+1
Fixed a build problem cause by a merge error from previous commits. Fixes warnings from maven compile Change-Id: I1ce88b2686b3be5ecd17113cbfde3e65297c27c6 Issue-ID: DCAEGEN2-1118 Signed-off-by: PatrikBuhr <patrik.buhr@est.tech>
2019-04-11Merge "Robustness issue"Vijay Venkatesh Kumar2-19/+40
2019-04-11Robustness issuePatrikBuhr3-20/+41
Limiting the number of paralell threads when retying of ftp or publish. Previously there was no upper limit on how many paralel threads that could be started by retry attempts. For instance, a worker thread with 100 new files would start 100 new threads when the ftt server was unavailable. Change-Id: Ia8792f03ea55c0c467ef248ddc9d59187c06a946 Issue-ID: DCAEGEN2-1118 Signed-off-by: PatrikBuhr <patrik.buhr@est.tech>
2019-04-11Extend heartbeat to also include som health statuselinuxhenrik5-7/+146
Add info about the internal status of DFC to the healtCheck message. Change-Id: Ic2ad3e5b97c42d6affe1ac4e1d7cf2274027f881 Issue-ID: DCAEGEN2-1403 Signed-off-by: elinuxhenrik <henrik.b.andersson@est.tech>
2019-04-11Housekeepingelinuxhenrik62-627/+2769
No functional changes made in this commit. Removed CheckStyle and Sonar warnings. Formatted code. Renamed methods and classes for better understanding. Removed unnecessary classes. Moved all code to single project. Change-Id: Ie3feb6c6a985e94a382812aa083dcf57bc46c7b3 Issue-ID: DCAEGEN2-1367 Signed-off-by: elinuxhenrik <henrik.b.andersson@est.tech>
2019-04-10Updating certificatesTamasBakai5-18/+15
Issue-ID: DCAEGEN2-1300 Change-Id: I9ce457b69e5866e77a465fb040d196b8905ca274 Signed-off-by: TamasBakai <tamas.bakai@est.tech>
2019-04-04Improved loggingPatrikBuhr14-216/+157
Fixed problem with startup which lead to that the REST API was not working running locally. Fixed problem with DmaapProducerHttpClient which would use no timeout, which can lead to infinitly haninging threads. A long timeout is used instead. Change-Id: I28469b1b3aaad0dab4cf247bb8af968e71a60133 Issue-ID: DCAEGEN2-1305 Signed-off-by: PatrikBuhr <patrik.buhr@est.tech>
2019-03-29Change file name sent to DataRouterelinuxhenrik6-30/+16
In the previous commit for this issue, the file name sent to DataRouter was changed. This turned out to be wrong, so in this commit it is changed back again. Change-Id: I9b0d726f406758846fd256626e73edf59d710c8b Issue-ID: DCAEGEN2-1256 Signed-off-by: elinuxhenrik <henrik.b.andersson@est.tech>
2019-03-22Local filename updated, stability issuesPatrikBuhr17-253/+204
The local filename is changed so it contains PNF name instead of the PNF IP address. The paralellism is restricted to 100 worker threads in order to solve problems with too many open file descriptors and out of memory. Logging is improved. Change-Id: I24ce2e23020cc253a3c7bebac1ab5cf703b5b144 Issue-ID: DCAEGEN2-1118 Signed-off-by: PatrikBuhr <patrik.buhr@est.tech>
2019-03-21Add check to DataRouter if file has been publishedmaximesson16-579/+1124
For each file in the FileReady message that DFC does not know if it has been published yet, it should ask DataRouter if it has been published already to avoid downloading and publishing a file more than once. Change-Id: I18117a6e968ec929aa255052a4c44f890a8ed39d Issue-ID: DCAEGEN2-1256 Signed-off-by: maximesson <maxime.bonneau@est.tech>