Commit Graph
100 Commits
Author SHA1 Message Date
Andrew DeMaria edd097ad5b Add a couple of static analysis badges 2019-03-31 19:33:32 -04:00
Andrew DeMaria cd45717256 Merge remote-tracking branch 'airsonic/pr/938' 2019-03-31 19:31:18 -04:00
Andrew DeMaria 570abe69d5 Merge remote-tracking branch 'airsonic/pr/939' 2019-03-31 19:29:39 -04:00
Andrew DeMaria d5500ce3d2 Merge remote-tracking branch 'airsonic/pr/941' 2019-03-31 19:24:26 -04:00
Andrew DeMaria 41a5ae06d5 Merge remote-tracking branch 'airsonic/pr/922' 2019-03-31 19:20:33 -04:00
Andrew DeMaria 6613bd86d5 Merge remote-tracking branch 'airsonic/pr/907' 2019-03-31 19:19:44 -04:00
Andrew DeMaria c9a209fd8f Merge remote-tracking branch 'airsonic/pr/943' 2019-03-31 19:16:41 -04:00
Andrew DeMaria 2b0fe25eff Merge remote-tracking branch 'airsonic/pr/946' 2019-03-31 19:16:28 -04:00
Andrew DeMaria e330eeb864 Remove coverity integration - not working 2019-03-27 20:50:03 -06:00
Andrew DeMaria 4e73266a7f Add travis ci badge 2019-03-27 19:58:55 -06:00
Andrew DeMaria 897de26886 Remove comment 2019-03-27 19:56:13 -06:00
Andrew DeMaria bc0bfdf481 Update scan token
Signed-off-by: Andrew DeMaria <lostonamountain@gmail.com>
2019-03-27 19:14:32 -06:00
Andrew DeMaria fb0079d3c0 Merge remote-tracking branch 'origin/pr/932' 2019-03-27 19:02:25 -06:00
Andrew DeMaria 54e1237320 Exclude new spring 5.0.5 cve 2019-03-27 19:00:14 -06:00
Andrew DeMariaandGitHub 5dc96ba011 Add coverity badge 2019-03-27 18:50:37 -06:00
Andrew DeMaria 8a1f36c792 Revert change to DWR fixes #923
Signed-off-by: Andrew DeMaria <lostonamountain@gmail.com>
2019-03-26 16:08:54 -06:00
Andrew DeMaria e76d44d957 Merge remote-tracking branch 'origin/pr/908' 2019-03-26 13:59:48 -06:00
Andrew DeMaria 9413f1f489 Merge remote-tracking branch 'origin/pr/912' 2019-03-26 13:00:39 -06:00
Andrew DeMaria 8f1d790784 Merge remote-tracking branch 'origin/pr/913' 2019-03-26 13:00:08 -06:00
Andrew DeMaria 00ee8a9662 Merge remote-tracking branch 'origin/pr/915' 2019-03-26 12:59:48 -06:00
Andrew DeMaria a3041a59c7 Merge remote-tracking branch 'origin/pr/916' 2019-03-26 12:59:22 -06:00
Andrew DeMaria 143a220719 Merge remote-tracking branch 'airsonic/pr/849'
Conflicts:
	airsonic-main/cve-suppressed.xml
	airsonic-main/src/main/java/org/airsonic/player/controller/JAXBWriter.java
	airsonic-main/src/main/java/org/airsonic/player/service/PodcastService.java
	pom.xml
2019-03-16 19:27:53 -04:00
Andrew DeMaria 0d78c30d06 Change a couple more log entries to debug 2019-03-16 12:56:57 -04:00
Andrew DeMaria 360f469bf1 Merge remote-tracking branch 'airsonic/pr/895' 2019-03-16 12:55:02 -04:00
Andrew DeMaria 972c6cd462 Dont sign until verify stage 2019-03-16 12:53:30 -04:00
Andrew DeMaria 3fb697ddce Update Changelog
Signed-off-by: Andrew DeMaria <lostonamountain@gmail.com>
2019-02-18 22:46:10 -05:00
Andrew DeMaria 1a88f46c18 CVE-2018-20222 Prevent xxe during parse
Signed-off-by: Andrew DeMaria <lostonamountain@gmail.com>
2019-02-18 22:46:05 -05:00
Andrew DeMaria faedfd8a62 Bump version to 10.3.0-SNAPSHOT
Signed-off-by: Andrew DeMaria <lostonamountain@gmail.com>
2019-02-18 21:58:15 -05:00
Andrew DeMaria a16b89e0ac Bump to version 10.2.0-RELEASE
Signed-off-by: Andrew DeMaria <lostonamountain@gmail.com>
2019-02-16 11:38:17 -07:00
Andrew DeMaria a1abdb580b Update changelog 2019-02-16 11:34:36 -07:00
Andrew DeMaria e4bb808862 Merge remote-tracking branch 'origin/pr/869' 2019-02-16 10:46:18 -07:00
Andrew DeMaria adc224147a Merge remote-tracking branch 'airsonic/pr/855' 2019-01-09 21:02:23 -05:00
Andrew DeMaria 5e14996dc3 Merge remote-tracking branch 'airsonic/pr/859' 2019-01-09 20:59:14 -05:00
Andrew DeMaria ac0e29bf9c Remove unused import 2019-01-08 21:57:23 -05:00
Andrew DeMaria 61c0c0d758 Fix import style error 2019-01-08 21:56:26 -05:00
Andrew DeMaria 06a8e2dc02 Merge remote-tracking branch 'airsonic/pr/833' 2019-01-08 21:46:11 -05:00
Andrew DeMaria 355868bf60 Bump spring version 2019-01-08 21:41:33 -05:00
Andrew DeMaria ee4cb71052 Ignore CVE-2018-8088 related to slf4j ext 2019-01-08 21:41:13 -05:00
Andrew DeMaria fb18862db4 Fix extraneous closing tag 2018-12-09 23:59:31 -05:00
Andrew DeMaria cddacb61c2 Merge remote-tracking branch 'airsonic/pr/834' 2018-12-09 23:48:49 -05:00
Andrew DeMaria 4d56df06ba Merge remote-tracking branch 'airsonic/pr/844' 2018-12-09 23:40:31 -05:00
Andrew DeMaria 7425e71d25 Ensure batch mode is used during CI 2018-12-09 23:29:05 -05:00
Andrew DeMaria 4dde6de2e8 Merge remote-tracking branch 'airsonic/pr/839' 2018-12-02 18:26:14 -05:00
Andrew DeMaria 3efd278799 Merge remote-tracking branch 'airsonic/pr/810' 2018-12-02 18:26:00 -05:00
Andrew DeMaria 5202845373 Bump version of guava to deal with CVE-2018-10237
Signed-off-by: Andrew DeMaria <lostonamountain@gmail.com>
2018-12-02 16:27:21 -05:00
Andrew DeMaria 8c4b2aa1fb Merge remote-tracking branch 'origin/pr/808' 2018-10-21 14:32:27 -06:00
Andrew DeMaria 8c6ddb1aba Dependency tweaks and remove extraneous code
Signed-off-by: Andrew DeMaria <lostonamountain@gmail.com>
2018-10-21 14:31:52 -06:00
Andrew DeMaria cd05af87dc Merge remote-tracking branch 'origin/pr/807' 2018-10-21 14:07:23 -06:00
Andrew DeMaria 5fd50d4ec2 Merge remote-tracking branch 'origin/pr/813' 2018-10-20 15:33:42 -06:00
Andrew DeMaria f8686d9638 Tweaked logging around servlet container and added warning about jetty
Signed-off-by: Andrew DeMaria <lostonamountain@gmail.com>
2018-10-20 15:30:37 -06:00
Andrew DeMaria afb0fb1d27 Merge remote-tracking branch 'origin/pr/814' 2018-10-20 14:58:19 -06:00
Andrew DeMaria 3288a75c3e Merge remote-tracking branch 'origin/pr/811' 2018-10-20 14:57:40 -06:00
Andrew DeMaria f8161f5184 White list jars that are scanned for tlds to prevent spurious logs
Signed-off-by: Andrew DeMaria <lostonamountain@gmail.com>
2018-10-20 16:42:23 -04:00
Andrew DeMaria 377f68543d Added profile to make running within a ide easier
Signed-off-by: Andrew DeMaria <lostonamountain@gmail.com>
2018-10-20 16:40:52 -04:00
Andrew DeMaria 609ca71307 Skip another irrelevant CVE
Signed-off-by: Andrew DeMaria <lostonamountain@gmail.com>
2018-10-18 16:41:39 -04:00
Andrew DeMaria 004b8bba37 Added docker based integration testing
Signed-off-by: Andrew DeMaria <lostonamountain@gmail.com>
2018-09-30 22:53:12 -06:00
Andrew DeMaria 685f4fa7e5 Merge remote-tracking branch 'origin/pr/801' 2018-09-29 10:07:52 -06:00
Andrew DeMaria d257800e1d Merge remote-tracking branch 'origin/pr/802' 2018-09-29 10:07:08 -06:00
Andrew DeMaria 8e1470a45a Dependency updates
Signed-off-by: Andrew DeMaria <lostonamountain@gmail.com>
2018-09-28 20:54:01 -04:00
Andrew DeMariaandGitHub 8876f5866b Update stale.yml 2018-09-19 22:48:35 -06:00
Andrew DeMaria 995d1fa667 Remove potential cast exception
Signed-off-by: Andrew DeMaria <lostonamountain@gmail.com>
2018-09-07 13:43:13 -06:00
Andrew DeMaria 30b767955e Merge remote-tracking branch 'origin/pr/790' 2018-09-07 13:24:31 -06:00
Andrew DeMaria 8ba0bc88f0 Fix maven version
Signed-off-by: Andrew DeMaria <lostonamountain@gmail.com>
2018-08-11 10:22:46 -06:00
Andrew DeMaria c56416a9ca Merge remote-tracking branch 'origin/pr/774'
Signed-off-by: Andrew DeMaria <lostonamountain@gmail.com>
2018-08-11 10:04:18 -06:00
Andrew DeMaria 85bf4b268d Change mirror
Signed-off-by: Andrew DeMaria <lostonamountain@gmail.com>
2018-08-11 10:03:26 -06:00
Andrew DeMaria b6a9b32b1c Merge remote-tracking branch 'airsonic/pr/775' 2018-08-09 21:50:01 -04:00
Andrew DeMaria c2c14b0dbe Update dependency check
Signed-off-by: Andrew DeMaria <lostonamountain@gmail.com>
2018-08-09 21:49:00 -04:00
Andrew DeMaria 5281d9ab6e Fix for false positive node vuln
Signed-off-by: Andrew DeMaria <lostonamountain@gmail.com>
2018-08-09 21:48:49 -04:00
Andrew DeMaria f6905dec1b Merge remote-tracking branch 'airsonic/pr/767' 2018-08-01 19:00:43 -04:00
Andrew DeMaria e3ea7beb96 Fix #764
Signed-off-by: Andrew DeMaria <lostonamountain@gmail.com>
2018-07-28 13:38:15 -06:00
Andrew DeMaria 8d3c0ec9a0 Updates
- Update Spring boot Version
- Update dependency check version
- Exclude irrelevant nodejs cve

Signed-off-by: Andrew DeMaria <lostonamountain@gmail.com>
2018-07-08 00:20:44 -04:00
Andrew DeMaria 3e1ea6f913 Fix #749 Ensure transcode settings are protected
Signed-off-by: Andrew DeMaria <lostonamountain@gmail.com>
2018-06-14 19:39:50 -04:00
Andrew DeMaria 431c98b496 Exclude cve CVE-2018-1115
Signed-off-by: Andrew DeMaria <lostonamountain@gmail.com>
2018-06-14 18:58:58 -04:00
Andrew DeMaria a097597bca Merge remote-tracking branch 'airsonic/pr/700' 2018-06-14 18:49:23 -04:00
Andrew DeMaria 40c9debf8e Merge remote-tracking branch 'airsonic/pr/698' 2018-05-07 19:44:02 -04:00
Andrew DeMaria 36d773dbfc Update cxf
Signed-off-by: Andrew DeMaria <lostonamountain@gmail.com>
2018-05-03 20:28:10 -04:00
Andrew DeMaria 2ea980d642 Update spring boot
Signed-off-by: Andrew DeMaria <lostonamountain@gmail.com>
2018-05-03 20:25:57 -04:00
Andrew DeMaria bbccce2303 Merge remote-tracking branch 'airsonic/pr/699' 2018-05-03 19:37:59 -04:00
Andrew DeMaria 5cca85f516 Ignore irrelevant CVE
Signed-off-by: Andrew DeMaria <lostonamountain@gmail.com>
2018-04-08 14:05:17 -04:00
Andrew DeMaria 893b652bcd Update dependency checker with updated maven too
Signed-off-by: Andrew DeMaria <lostonamountain@gmail.com>
2018-04-08 14:04:45 -04:00
Andrew DeMaria ce5920ce4c Merge remote-tracking branch 'origin/pr/674' 2018-01-11 10:34:24 -07:00
Andrew DeMaria caae31452e Bump to 10.2.0 snapshot
Signed-off-by: Andrew DeMaria <lostonamountain@gmail.com>
2017-12-21 11:09:31 -07:00
Andrew DeMaria dbd2a738eb Made it easier to see current playing song for dark themes
Signed-off-by: Andrew DeMaria <lostonamountain@gmail.com>
2017-12-20 18:41:49 -07:00
Andrew DeMaria a93a18a055 Fixed elipse in english translation
Signed-off-by: Andrew DeMaria <lostonamountain@gmail.com>
2017-12-20 18:15:16 -07:00
Andrew DeMaria b0aff38caf Fix #658 again: content type for unscaled images set based on jaudiotagger output
Signed-off-by: Andrew DeMaria <lostonamountain@gmail.com>
2017-12-20 18:01:57 -07:00
Andrew DeMaria 11ec30cd9f Revert "Fix #658 content type for full size cover arts"
This reverts commit 18b16eb859.
2017-12-20 17:09:51 -07:00
Andrew DeMaria 18b16eb859 Fix #658 content type for full size cover arts
Signed-off-by: Andrew DeMaria <lostonamountain@gmail.com>
2017-12-20 16:53:16 -07:00
Andrew DeMaria 535d5d06cb Release 10.1.1
Signed-off-by: Andrew DeMaria <lostonamountain@gmail.com>
2017-12-16 14:03:40 -07:00
Andrew DeMaria ba481869c8 Updated changelog
Signed-off-by: Andrew DeMaria <lostonamountain@gmail.com>
2017-12-16 14:03:05 -07:00
Andrew DeMaria 80e2617f04 Merge remote-tracking branch 'airsonic/pr/643' 2017-12-11 19:51:46 -07:00
Andrew DeMaria 511f278624 Merge remote-tracking branch 'airsonic/pr/647' 2017-12-11 19:51:03 -07:00
Andrew DeMaria 5e47bc500e Fix maven profile mixup with sign/tomcat-embed
Signed-off-by: Andrew DeMaria <lostonamountain@gmail.com>
2017-12-04 19:35:04 -07:00
Andrew DeMaria e39f5d98d0 Fixed dependency check issues
Signed-off-by: Andrew DeMaria <lostonamountain@gmail.com>
2017-11-18 12:42:48 -07:00
Andrew DeMaria c969a60eda Merge remote-tracking branch 'origin/pr/629' 2017-11-18 12:27:20 -07:00
Andrew DeMaria 78006946ea Bump 10.2.0-SNAPSHOT
Signed-off-by: Andrew DeMaria <lostonamountain@gmail.com>
2017-11-04 12:15:57 -06:00
Andrew DeMaria e04cda4293 Release 10.1.0
Signed-off-by: Andrew DeMaria <lostonamountain@gmail.com>
2017-11-04 12:06:02 -06:00
Andrew DeMaria 143cc5a40c Added gpg sign profile
Signed-off-by: Andrew DeMaria <lostonamountain@gmail.com>
2017-11-04 12:05:56 -06:00
Andrew DeMaria 81525494ee Updated Changelog
Signed-off-by: Andrew DeMaria <lostonamountain@gmail.com>
2017-11-04 11:32:32 -06:00
Andrew DeMaria c7789533a0 Don't require csrf for search endpoint
Reasoning:

- It doesn't change state and is not a sensitive endpoint
- It really should be changed to GET but that is a bit more intrusive
  change that can be done at another time
- The search csrf token is stored on the top.jsp page for a long time.
  If the user keeps this tab open for a while it is possible the csrf
  token will change on their session with other requests going on such
  that the search csrf token becomes wrong/stale.

Signed-off-by: Andrew DeMaria <lostonamountain@gmail.com>
2017-10-29 15:10:49 -06:00
Andrew DeMaria ded28c4669 Merge remote-tracking branch 'airsonic/pr/604' 2017-10-23 20:27:37 -06:00