summaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2018-07-25Merge "Decision BlackList Guard Enhancements"Jorge Hernandez15-244/+1083
2018-07-25Merge "Fix sonar issue about nested stmts"Jorge Hernandez3-281/+306
2018-07-25Fix sonar issue about nested stmtsKrishnajinka3-281/+306
Refactor code to not nest more than 3 condition or loop stmts in policy PolicyEngineUtils. Rework based on review comments Issue-ID: POLICY-1003 Change-Id: I95fcfa0f99c517c02357c85ca39cd2f934e8da4d Signed-off-by: Krishnajinka <kris.jinka@samsung.com>
2018-07-24Decision BlackList Guard Enhancementsrb714715-244/+1083
While creating a decision Bl Guard Policy we are allowing to add Blacklist entries through file upload for bulk from GUI. Issue-ID: POLICY-901 Change-Id: I4031fd4a96937b9facc330cecf72777d701d4678 Signed-off-by: rb7147 <rb7147@att.com>
2018-07-24Merge "Refactor PolicyNotificationMail for sonar issues"Pamela Dragosh1-118/+152
2018-07-23Add modified copyright noticeKrishnajinka12-646/+658
For the files which are modified add modified copyright notices as per comments from earlier review Issue-ID: POLICY-1002 Change-Id: I873b3ccc986d5f3d138ddb9e9b3c2307a0b127a6 Signed-off-by: Krishnajinka <kris.jinka@samsung.com>
2018-07-23Refactor PolicyNotificationMail for sonar issuesKrishnajinka1-118/+152
SONAR flagged issues related with complexity of method being high and more than 3 nested loops in the PolicyNotificationMail Issue-ID: POLICY-986 Change-Id: Ife3e6b5610cec4bcf3898fdcad4cc2c9a3d61932 Signed-off-by: Krishnajinka <kris.jinka@samsung.com>
2018-07-20FIX SONAR ISSUE NESTED TRY BLOCKSKrishnajinka9-1875/+1925
refactor the code for nested try blocks and rework based on comments and fix nested loops complexity Issue-ID: POLICY-976 Change-Id: Ied02b7838b5e4839a4906f79ff37c4fd6afeccfe Signed-off-by: Krishnajinka <kris.jinka@samsung.com>
2018-07-17Upgrade tomcat to clear security issuesPamela Dragosh2-3/+3
New security issue has appeared, so we will do minor upgrade. Issue-ID: POLICY-982 Change-Id: I58ee20ec07300ab586017ca2072f63329e6f3417 Signed-off-by: Pamela Dragosh <pdragosh@research.att.com>
2018-07-17USE TRY WITH RESOURCESKrishnajinka7-4239/+4216
Fix sonar issues to convert try blocks to try with resources plus change tabs 2 space Issue-ID: POLICY-961 Change-Id: I553d6a42f1efaab5b7eb3a53bab945a3360e69bb Signed-off-by: Krishnajinka <kris.jinka@samsung.com>
2018-07-13Reverting "Merge "fix try block""Jorge Hernandez7-30/+55
This reverts commit 240bbdbdc76e0e91af9f18164eadb2708d14c6fb, reversing changes made to 3ee69f1af0acddd1e06060ad88c0029fe7ceeaaf. Change-Id: I61f07ead1d7d3e89c512a2224efecf9ac440df10 Issue-ID: POLICY-961 Signed-off-by: Jorge Hernandez <jh1730@att.com>
2018-07-13Merge "fix try block"Jorge Hernandez7-55/+30
2018-07-13fix try blockKrishnajinka7-55/+30
Issue-ID: POLICY-961 Change-Id: Ia1f388368007a4a82a57520dc6ddd99cc484a393 Signed-off-by: Krishnajinka <kris.jinka@samsung.com>
2018-07-12Upgrade Portal SDK to resolve Security IssuesMichael Mokry4-2/+102
Upgraded version in pom to 2.3.1 Added SQL scripts from Portal to Upgrade Portal related db tables Added SQL downgrade script and license header Sorted SQL commands in upgrade script by function_cd per Jim Change-Id: Id6bef295956b6ec5b13d8fbd0006bbfe98c1c0ac Issue-ID: POLICY-918 Signed-off-by: Mike Mokry <mm117s@att.com>
2018-06-29Revert "Fix policy gui missing schema_info table"Joseph Chou1-16/+1
This reverts commit e67481ed648c419a1645d0fc8b98506fe544a454. Change-Id: I092053ec1815cf7ca598b1913663532673125604 Issue-ID: POLICY-898 Signed-off-by: Joseph Chou <jc2555@att.com>
2018-06-27Merge "Address missing files in junit tests"Liam Fallon4-0/+88
2018-06-27Merge "Don't use hard-coded tmp path"Liam Fallon2-8/+21
2018-06-27Merge "Fix console warning about xacml.properties"Liam Fallon1-0/+2
2018-06-26Address missing files in junit testsJim Hahn4-0/+88
Renamed logback.xml to logback-test.xml. Added policyLogger.properties to config directories. Change-Id: Ib6f50666a13c3258482b4007e7ceeb742f2e87a6 Issue-ID: POLICY-784 Signed-off-by: Jim Hahn <jrh3@att.com>
2018-06-26Remove %h from log file namesJim Hahn3-5/+5
Modified code, either removing "%h" or replacing it with a directory name that is relative to the junit test. Change-Id: I6ea3e3139a04fefadca42340454be36a5b54445d Issue-ID: POLICY-784 Signed-off-by: Jim Hahn <jrh3@att.com>
2018-06-26Fix console warning about xacml.propertiesJim Hahn1-0/+2
Configured location of property file. Change-Id: I58a89b34aa58f4efd6ed3ee0f984869ee7bf2f6c Issue-ID: POLICY-921 Signed-off-by: Jim Hahn <jrh3@att.com>
2018-06-26Don't use hard-coded tmp pathJim Hahn2-8/+21
Modified code to use java system variable to identify temp directory. Change-Id: Ib656dd2a2d57e43febb0daaa25cf90cb1b9330a7 Issue-ID: POLICY-920 Signed-off-by: Jim Hahn <jrh3@att.com>
2018-06-20Change PrefixList.class to Zone.classJim Hahn2-625/+428
Changed the class. Modified the junit test to catch that type of issue, refactoring it to extract common code. Change-Id: Ibc3d22821f103cd3954d2f2f54d4d62307dbf4c6 Issue-ID: POLICY-909 Signed-off-by: Jim Hahn <jrh3@att.com>
2018-06-15Fix policy gui missing schema_info tableJoseph Chou1-1/+16
Modify docker-install.sh to include db schema update Change-Id: I75941522ea932e59cd85d7ff9887bf7d4759ae7c Issue-ID: POLICY-898 Signed-off-by: Joseph Chou <jc2555@att.com>
2018-06-12Merge "Set default logger to EELF instead of SYSTEMOUT"Pamela Dragosh2-2/+2
2018-06-12Use POLICY_LOGS env variable in logging.propertiesJim Hahn4-14/+23
Some logger.properties have /var/log/onap hard-coded; changed those to use $POLICY_LOGS. Other logger.properties had ${POLICY_LOGS} instead of ${{POLICY_LOGS}}; fixed those, too. Change-Id: I56faf5982abf520ee364b54a3560313d0f15cc2a Issue-ID: POLICY-784 Signed-off-by: Jim Hahn <jrh3@att.com>
2018-06-12Set default logger to EELF instead of SYSTEMOUTJim Hahn2-2/+2
Change-Id: I3395d3b95b11bf0166190beb454e60cb63de7454 Issue-ID: POLICY-784 Signed-off-by: Jim Hahn <jrh3@att.com>
2018-06-08Merge "Enforce logback version"Liam Fallon1-0/+6
2018-06-08Enforce logback versionJim Hahn1-0/+6
Some of the projects are being built with logback version, 1.1.3, which does not support the SizeAndTimeBasedRollingPolicy appender. Updated the offending pom.xml to force it to use logback 1.2.3 instead. Change-Id: I3277b28133498f4ad9fbc3ed8b3e9e7e9519bbeb Issue-ID: POLICY-785 Signed-off-by: Jim Hahn <jrh3@att.com>
2018-06-08Merge "Decryption messages should not be errors"Pamela Dragosh1-2/+2
2018-06-08Merge "Remove "&quot;" from logback xml files"Liam Fallon7-10/+10
2018-06-08Remove "&quot;" from logback xml filesJim Hahn7-10/+10
Logback complains if %d{} values contain "&quot;", but it works fine without them, thus they have been removed. Update licenses. Change-Id: Id1f21d3d51bb2495a92f54fcf5c3ad978612c375 Issue-ID: POLICY-785 Signed-off-by: Jim Hahn <jrh3@att.com>
2018-06-08Decryption messages should not be errorsJim Hahn1-2/+2
Modified code to generate INFO messages when decryption fails, instead of ERROR or WARN. Also modified some of the text in the afforementioned messages. Change-Id: I895967cf16b0e5667e1797bc16ea1ede81d6dd7a Issue-ID: POLICY-785 Signed-off-by: Jim Hahn <jrh3@att.com>
2018-06-08Fixed Model Content Validation for APIMichael Mokry1-2/+3
This fixes the validation of the content of the model to include validating parent nodes that are required based on the yaml. Prior to this we were only validating required child nodes and in some cases this was causing failures to create a policy. Change-Id: I2bbef4a671cfc7af8b55b3b3c6454b8cea3a88c9 Issue-ID: POLICY-799 Signed-off-by: Michael Mokry <mm117s@att.com>
2018-06-07Doc Updates: Policy OOM; StateMgmtSaryu Shah7-102/+556
Updated policy documentation: Policy OOM; StateMgmt ------------------------------------------------------------- Change-Id: I6abf933d842ddf9e1c88b8eec714bd7a00e07bf8 Issue-ID: POLICY-536 Signed-off-by: Saryu Shah <ss3917@att.com>
2018-06-05Update engine to SNAPSHOT-1.3.0liamfallon23-46/+46
Snapshot updated for Casablanca. Change-Id: Ieb2c9a990c0f36f31c974038465e7d38aaa21e5d Issue-ID: POLICY-875 Signed-off-by: liamfallon <liam.fallon@ericsson.com>
2018-05-31Document Security section of the Release NotesGildas Lanilis1-2/+9
Change-Id: I2b74eb994ec16f47654e84a43a066c3497caca62 Issue-ID: DOC-271 Signed-off-by: Gildas Lanilis <gildas.lanilis@huawei.com>
2018-05-29Update Release Notesv1.2.32.0.0-ONAP2.0.0-ONAPSaryu Shah1-3/+12
Update Release Notes ------------------------------------------------------------- Change-Id: I6283bc08bb95d49a343047968049e1cca5f53bf7 Issue-ID: POLICY-536 Signed-off-by: Saryu Shah <ss3917@att.com>
2018-05-25Sonar fixes for TOSCA ParserMichael Mokry1-6/+10
I fixed the sonar blocker in regards to nullPointerException and few other majors that I found and were easy to fix. I ran my local sonar and the blocker was removed after the changes. Change-Id: I7dcd7584fc955e1b520235a8e1376cf871761d21 Issue-ID: POLICY-776 Signed-off-by: Michael Mokry <mm117s@att.com>
2018-05-24Merge "Replace LOGPATH with LOGSUFFIX"Pamela Dragosh13-20/+39
2018-05-24Merge "Fix Issues in TOSCA Parser"Pamela Dragosh3-10/+65
2018-05-23Fix Issues in TOSCA ParserWang,Frank(gw1218)3-10/+65
Fixed a bug and added some new validations in TOSCA Parser Issue-ID: POLICY-776 Change-Id: I2dc1b5b38cd137efc5c24ccf55b19de9f47c44da Signed-off-by: Wang,Frank(gw1218) <gw1218@att.com>
2018-05-23Replace LOGPATH with LOGSUFFIXJim Hahn14-21/+40
docker-install.sh does not expand ${{xxx}} values in .conf files before using them to update target files. Consequently, replaced LOGPATH with LOGSUFFIX in .conf files and updated target files to use ${{POLICY_LOGS}}${{LOGSUFFIX}} instead. Replace "${POLICY_HOME}/logs" in auxiliary files (e.g., logrotate) with "${POLICY_LOGS}/policy". Update license dates. In .sh files, changed ${{POLICY_LOGS}} to ${POLICY_LOGS}, and ensured that env.sh is sourced. Use hard-coded paths in conf files instead of replacing LOGPATH with LOGSUFFIX. Update license dates. Repoint path for IntegrityMonitor.log, as we cannot easily move since it's in common. Replace hard-coded log path in docker-install.sh. Undo hard-coded log paths where possible, and modify scripts to pass $POLICY_LOGS to JVM. Change-Id: I027d8d2173ae97fef73b0daff1d6a87452857f93 Issue-ID: POLICY-759 Signed-off-by: Jim Hahn <jrh3@att.com>
2018-05-22Updated version/date in release notesSaryu Shah1-2/+2
Updated version/date in release notes ------------------------------------------------------------- Change-Id: I3d2fa0f7641074251e97e9f7b75772e9c8abe9f7 Issue-ID: POLICY-536 Signed-off-by: Saryu Shah <ss3917@att.com>
2018-05-22Merge "Update yml to use $POLICY_LOGS"Pamela Dragosh1-1/+1
2018-05-22Merge "Update Policy Engine to 1.2.3-SNAPSHOT"Jorge Hernandez23-45/+45
2018-05-22Update yml to use $POLICY_LOGSJim Hahn1-1/+1
Change-Id: I4fec68b7bd50f8e71e36510bf595126435726677 Issue-ID: POLICY-759 Signed-off-by: Jim Hahn <jrh3@att.com>
2018-05-21Updated release notesSaryu Shah1-4/+5
Updated release notes ------------------------------------------------------------- Change-Id: I4f6282d25d177078306954be852a28301eb26c2d Issue-ID: POLICY-536 Signed-off-by: Saryu Shah <ss3917@att.com>
2018-05-21Update Policy Engine to 1.2.3-SNAPSHOTliamfallon23-45/+45
These reviews must be merged in order because of layering. This review should be merged FOURTH. Change-Id: Ifca8e33b79085a4032164b44dae3401f8179f5f6 Issue-ID: POLICY-844 Signed-off-by: liamfallon <liam.fallon@ericsson.com>
2018-05-18Add braces around property nameJim Hahn1-2/+2
In pdplp.conf, changed ${POLICY_LOGS} to ${{POLICY_LOGS}}. Change-Id: Id952dee7a38b868fea5650f4e54bfccb612bb56c Issue-ID: POLICY-759 Signed-off-by: Jim Hahn <jrh3@att.com>