Commit Graph

857 Commits

Author SHA1 Message Date
Erwin de Haan
1f3aa3fe6f Apply review suggestions 2021-03-20 01:28:14 +01:00
Erwin de Haan
239a7156cc Fix arbitrary image file reads in ImageByNameController
GHSL-2021-050: Issue 4 Arbitrary image file read and directory traversal.
2021-03-20 01:14:59 +01:00
Erwin de Haan
f61d18612b Fix directory traversal in the HlsSegmentController in a fairly rudimentary but working way.
GHSL-2021-050: Issue 1,2,3 Arbitrary file read and directory traversal.
The segment id's can probably just be verified to be an actual ID or to not contain any forward or backward slashes
2021-03-20 01:14:59 +01:00
Patrick Barron
e5380c653b Merge branch 'master' into ef-cleanup
# Conflicts:
#	Jellyfin.Data/Entities/Libraries/MediaFileStream.cs
#	Jellyfin.Data/Jellyfin.Data.csproj
2021-03-14 10:19:35 -04:00
Bond-009
0e5d4a3bcf
Merge pull request #5422 from Bond-009/warn51 2021-03-14 00:41:40 +01:00
Bond-009
8bb2420a25
Merge pull request #5518 from crobibero/missing-endpoints
Add missing InstantMix endpoints
2021-03-13 22:59:47 +01:00
Bond_009
a8ed753f6c FxCop -> Net Analyzers (part 2) 2021-03-13 22:33:28 +01:00
crobibero
9ac9543ee2 Add missing InstantMix endpoints 2021-03-13 09:09:22 -07:00
Bond-009
260b48ef9d
Merge pull request #5515 from jellyfin/fix-refresh-endpoint
fix refresh endpoint
2021-03-13 15:07:42 +01:00
Claus Vium
fe2a310fe2
fix refresh endpoint
It was originally a POST 9af6eda0b4/MediaBrowser.Api/Library/LibraryService.cs (L155)
2021-03-13 09:13:45 +01:00
crobibero
eef15dc7ac Fix third part integration 2021-03-11 22:45:58 -07:00
David
60ffa6f514 Use FileShare.None when creating files 2021-03-07 14:43:28 +01:00
Patrick Barron
f638ee6b09 Enable nullable for Jellyfin.Data and remove unnecessary attributes 2021-03-06 17:43:01 -05:00
Bond-009
e839929b91
Merge pull request #5380 from Bond-009/plugins
100% branch coverage for DashboardController
2021-03-06 00:59:28 +01:00
Bond-009
3741be51ec
Merge pull request #5383 from cvium/fix-mergeversions-overflow
do not pick a linked item as primary when merging versions
2021-03-05 21:57:22 +01:00
cvium
59814bd55e do not pick a linked item as primary when merging versions 2021-03-05 19:57:48 +01:00
Claus Vium
d0a2d00b29
Fix UpdateMediaPath model binding (#5378) 2021-03-05 16:56:21 +01:00
Bond_009
a6d0db5d04 100% branch coverage for DashboardController 2021-03-05 11:15:14 +01:00
crobibero
858c91ab48 Specify defaults or set query parameter to nullable 2021-03-04 18:25:52 -07:00
Bond_009
914e891689 Fix unchecked input 2021-02-24 02:05:12 +01:00
Joshua M. Boniface
7ece3c5523
Merge pull request #5273 from Bond-009/warn31 2021-02-22 21:00:46 -05:00
Bond_009
ec3237ba55 Fix tests 2021-02-22 13:46:40 +01:00
Bond_009
57102090d3 Add tests for DashboardController 2021-02-22 13:15:29 +01:00
Bond_009
40b9e7592f Fix build 2021-02-20 23:34:15 +01:00
dkanada
13d65318eb
Merge pull request #5223 from Bond-009/minor10
Minor improvements
2021-02-20 10:56:55 +09:00
Bond_009
65bab55ca0 Minor improvements 2021-02-13 00:39:18 +01:00
dkanada
9fcdbd4c4b remove deprecated settings from server config 2021-02-12 21:58:37 +09:00
Bond-009
76d66e0dee
Merge pull request #5208 from crobibero/api-post-image
Add image file accept to openapi
2021-02-11 17:42:28 +01:00
crobibero
223b42aed3 Create BaseItemKind enum 2021-02-10 17:09:23 -07:00
crobibero
d5f0b046bb Add image file accept to openapi 2021-02-10 16:12:52 -07:00
David Ullmer
07f1a2c2dc
Update Jellyfin.Api/Controllers/UserController.cs
Co-authored-by: Cody Robibero <cody@robibe.ro>
2021-02-06 18:36:18 +01:00
David
eb0ff0c370 Fix forgot password pin request 2021-02-06 17:18:37 +01:00
dkanada
86859a3926
Merge pull request #5010 from BaronGreenback/Remove_IPluginConfigurationPage
Removal of IPluginConfigurationPage
2021-02-05 11:38:44 +09:00
Bond-009
4a2678e63b
Merge pull request #5097 from Bond-009/cleanup4
Remove useless abstraction and clean up formatting
2021-01-26 17:44:49 +01:00
crobibero
77b417e41e Mark non-nullable body as null 2021-01-24 15:02:56 -07:00
Bond_009
1c2cd7efa0
Remove useless abstraction and clean up formatting 2021-01-24 13:32:29 +01:00
crobibero
55670b91b2 Use ArrayModelBinder for sortBy and sortOrder 2021-01-23 17:32:13 -07:00
crobibero
59ff2c5b4b Add ability to mark query parameter as obsolete. 2021-01-20 16:24:15 -07:00
crobibero
3b9567d583 Add query parameter to disable returning first episode as next up 2021-01-15 15:08:48 -07:00
BaronGreenback
a4e838fbf5 Remoed configurationPageType 2021-01-15 10:36:44 +00:00
BaronGreenback
c6aa6ceed9 Removal of IPluginConfigurationPage 2021-01-12 22:10:23 +00:00
crobibero
5f998bdd1f Require elevated auth to upload subtitles 2021-01-10 10:48:37 -07:00
crobibero
a15e126ef8 Fix inverted SkipWhile 2021-01-02 19:23:54 -07:00
Cody Robibero
5c57569692
Merge branch 'master' into PluginDowngrade 2020-12-30 18:11:37 -07:00
BaronGreenback
4c291da45c
Encoding fix for System Logs. (#4564) 2020-12-30 18:31:26 +01:00
BaronGreenback
889e988167 Updated to latest unstable. 2020-12-23 17:25:34 +00:00
BaronGreenback
62702fa3eb Changes as requested 2020-12-23 16:28:50 +00:00
Joshua M. Boniface
bfdd4727b5
Merge pull request #4850 from BaronGreenback/NetworkApiFix
Null reference fix
2020-12-22 22:21:59 -05:00
Joshua M. Boniface
a77788906c
Merge pull request #4821 from BaronGreenback/disableDlna 2020-12-22 22:20:44 -05:00
BaronGreenback
e113a50597 Possible null reference fix. 2020-12-22 16:14:06 +00:00