-
Notifications
You must be signed in to change notification settings - Fork 72
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Secure the subscription passwords (#543)
* Missing the encryption of the passwords when updating the subscription. Fixed the issue by encrypting the passwords when updation of the subscription. Also updated the code not to print the passwords in debug logs. * Update main.yml updated the main.yml to trigger local changes * Revert the change to enable only for community branch * Revert work flow changes * Missing the encryption of the passwords when updating the subscription. Fixed the issue by encrypting the passwords when updation of the subscription. Also updated the code not to print the passwords in debug logs. * Update main.yml updated the main.yml to trigger local changes * Revert the change to enable only for community branch * Revert work flow changes * Rebase master * Added Nidhi changes for testcases --------- Co-authored-by: Raju Beemreddy <[email protected]> Co-authored-by: Dhruvin Kalavadia (EXT) <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Jainad Chinta <[email protected]>
- Loading branch information
5 people
authored
Apr 10, 2024
1 parent
cb5703b
commit 0c1366f
Showing
8 changed files
with
247 additions
and
34 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,40 @@ | ||
| package com.ericsson.ei.logFilter; | ||
|
|
||
| import ch.qos.logback.classic.spi.ILoggingEvent; | ||
| import ch.qos.logback.core.filter.Filter; | ||
| import ch.qos.logback.core.spi.FilterReply; | ||
| import org.springframework.context.annotation.PropertySource; | ||
|
|
||
| import java.time.LocalDateTime; | ||
| import java.time.format.DateTimeFormatter; | ||
| import java.time.temporal.ChronoUnit; | ||
|
|
||
| @PropertySource("classpath:logback.xml") | ||
| public class LogFilter extends Filter<ILoggingEvent> { | ||
|
|
||
| public boolean filter(LocalDateTime start, LocalDateTime end, String logLine) { | ||
| DateTimeFormatter logFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss,SSS"); | ||
| LocalDateTime current=start; | ||
| while(current.isBefore(end)) | ||
| { | ||
| String time=current.format(logFormatter); | ||
| if(logLine.contains(time)) | ||
| { | ||
| return (true); | ||
| } | ||
| else | ||
| { | ||
| current=current.plus(1, ChronoUnit.MILLIS); | ||
| } | ||
|
|
||
|
|
||
| } | ||
| return (false); | ||
| } | ||
|
|
||
| @Override | ||
| public FilterReply decide(ILoggingEvent iLoggingEvent) { | ||
| return null; | ||
| } | ||
| } | ||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,85 @@ | ||
| # Configuration documentation can be found here: | ||
| # https://github.com/eiffel-community/eiffel-intelligence/blob/master/wiki/configuration.md | ||
| spring.application.name: eiffel-intelligence | ||
| server.port: 8090 | ||
| spring.mvc.pathmatch.matching-strategy: ANT_PATH_MATCHER | ||
| logging.level.root: INFO | ||
| logging.level.org.springframework.web: ERROR | ||
| logging.level.com.ericsson.ei: ERROR | ||
|
|
||
| rules.path: /rules/ArtifactRules-Eiffel-Agen-Version.json | ||
| rules.replacement.marker: %IdentifyRulesEventId% | ||
|
|
||
| # WARNING! Do not enable this in a production environment! | ||
| test.aggregation.enabled: false | ||
|
|
||
| rabbitmq.host: localhost | ||
| rabbitmq.port: 5672 | ||
| rabbitmq.user: myuser | ||
| rabbitmq.password: myuser | ||
| rabbitmq.tls.version: | ||
| rabbitmq.exchange.name: ei-exchange | ||
| rabbitmq.domain.id: ei-domain | ||
| rabbitmq.component.name: eiffel-intelligence | ||
| rabbitmq.queue.suffix: messageQueue | ||
| rabbitmq.queue.durable: true | ||
| rabbitmq.binding.key: # | ||
| rabbitmq.waitlist.queue.suffix: waitList | ||
|
|
||
| bindingkeys.collection.name: binding_keys | ||
|
|
||
| spring.data.mongodb.uri: mongodb://localhost:27017 | ||
| spring.data.mongodb.database: eiffel_intelligence | ||
|
|
||
| server.session.timeout: 1200 | ||
| sessions.collection.name: sessions | ||
|
|
||
| aggregations.collection.name: aggregations | ||
| aggregations.collection.ttl: | ||
| event.object.map.collection.name: event_object_map | ||
| subscriptions.collection.name: subscriptions | ||
| subscriptions.repeat.handler.collection.name: subscriptions_repeat_handler | ||
| waitlist.collection.name: wait_list | ||
| waitlist.collection.ttl: 600 | ||
| waitlist.resend.initial.delay: 2000 | ||
| waitlist.resend.fixed.rate: 15000 | ||
| failed.notifications.collection.name: failed_notifications | ||
| failed.notifications.collection.ttl: 600 | ||
| notification.retry: 3 | ||
| notification.httpRequest.timeout: 5000 | ||
|
|
||
| email.sender: [email protected] | ||
| email.subject: Email Subscription Notification | ||
|
|
||
| spring.mail.host: | ||
| spring.mail.port: | ||
| spring.mail.username: | ||
| spring.mail.password: | ||
| spring.mail.properties.mail.smtp.auth: false | ||
| spring.mail.properties.mail.smtp.starttls.enable: false | ||
|
|
||
| event.repository.url: | ||
| event.repository.shallow: true | ||
|
|
||
| ldap.enabled: false | ||
| ldap.server.list: [{\ | ||
| "url": "",\ | ||
| "base.dn": "",\ | ||
| "username": "",\ | ||
| "password": "",\ | ||
| "user.filter": ""\ | ||
| }] | ||
|
|
||
| ### DEVELOPER SETTINGS | ||
|
|
||
| spring.mongodb.embedded.version: 3.4.1 | ||
| # We remove the embedded mongodb in tests since in most of them we set up our own before Spring | ||
| # starts and activate it manually in tests where we need the Spring's own embedded mongo DB | ||
| spring.autoconfigure.exclude: org.springframework.boot.autoconfigure.mongo.embedded.EmbeddedMongoAutoConfiguration | ||
|
|
||
| threads.core.pool.size: 200 | ||
| threads.queue.capacity: 7000 | ||
| threads.max.pool.size: 250 | ||
| scheduled.threadpool.size: 200 | ||
| jasypt.encryptor.password=test | ||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters