Commit Graph

257 Commits

Author SHA1 Message Date
Patrick Barron
eef7cfd912 Make SonarCloud less angry 2020-05-26 22:43:03 -04:00
Patrick Barron
01ce56016a Merge branch 'master' into userdb-efcore
# Conflicts:
#	Emby.Server.Implementations/Library/UserManager.cs
#	Jellyfin.Data/Jellyfin.Data.csproj
#	MediaBrowser.Api/UserService.cs
#	MediaBrowser.Controller/Library/IUserManager.cs
2020-05-26 20:29:11 -04:00
gion
e42bfc92f3 Fix code issues 2020-05-26 11:37:52 +02:00
gion
e4838b0faa Merge remote-tracking branch 'upstream/master' into syncplay 2020-05-26 10:23:09 +02:00
Patrick Barron
c464f700db Remove redundant qualifiers 2020-05-20 13:07:53 -04:00
Patrick Barron
d35a7ba8bd Fix more issues 2020-05-20 10:04:00 -04:00
ConfusedPolarBear
949e4d3e64 Apply suggestions from code review 2020-05-18 16:58:14 -05:00
ConfusedPolarBear
85f04af04c Reuse existing CORS function 2020-05-18 14:31:47 -05:00
ConfusedPolarBear
3a61c9a878 Merge remote-tracking branch 'upstream/master' into access-control 2020-05-18 14:27:51 -05:00
Mark Monteiro
5eec3a1342
Remove extra whitespace
Co-authored-by: dkanada <dkanada@users.noreply.github.com>
2020-05-18 10:47:01 -04:00
Mark Monteiro
634bc73c9a DO not use developer exception page when exception stack trace should be ignored 2020-05-17 18:07:37 -04:00
Patrick Barron
aca7e221d8 Merge branch 'master' into userdb-efcore
# Conflicts:
#	Emby.Server.Implementations/Activity/ActivityLogEntryPoint.cs
#	Emby.Server.Implementations/ApplicationHost.cs
#	Emby.Server.Implementations/Devices/DeviceManager.cs
#	Jellyfin.Server/Jellyfin.Server.csproj
#	Jellyfin.Server/Migrations/MigrationRunner.cs
#	MediaBrowser.Controller/Devices/IDeviceManager.cs
2020-05-15 17:20:07 -04:00
gion
029bb80910 Merge remote-tracking branch 'upstream/master' into syncplay 2020-05-15 18:59:35 +02:00
Frank Riley
9ee10d22c8 Rename function 2020-05-14 16:15:09 -07:00
Frank Riley
6990af811a Use simpler dictionary iterator. 2020-05-14 16:15:09 -07:00
Frank Riley
c70c589236 Update Emby.Server.Implementations/HttpServer/HttpListenerHost.cs from review
Co-authored-by: Cody Robibero <cody@robibe.ro>
2020-05-14 16:15:09 -07:00
Frank Riley
3cb6fd8a27 Fix #3083: Set the Access-Control-Allow-Origin header to the request origin/host header if possible 2020-05-14 16:15:03 -07:00
Mark Monteiro
2e09311a93
Merge branch 'master' into websocket 2020-05-14 11:08:08 -04:00
Patrick Barron
9ad839c776 Initial migration code 2020-05-12 22:10:35 -04:00
Mark Monteiro
dc5165b97f Merge branch 'master' into simplify-https-config 2020-05-10 14:43:57 -04:00
gion
6e22e9222b Fix code issues 2020-05-09 12:37:23 +02:00
ConfusedPolarBear
df65e3ab0d Add Access-Control-Allow-Origin header to exceptions
Fixes #1794
2020-05-02 15:33:45 -05:00
Bond_009
3623aafcb6 Make SonarCloud happy 2020-05-02 01:30:04 +02:00
Bond_009
04f826e50c Fix merge errors 2020-05-02 01:09:35 +02:00
Bond_009
15634a1913 Merge branch 'master' into websocket 2020-05-02 00:54:04 +02:00
Vasily
5922c35d69
Merge pull request #2920 from Bond-009/tests2
Add some simple tests
2020-04-29 12:17:01 +03:00
gion
083d3272d0 Refactor and other minor changes 2020-04-27 22:39:37 +02:00
gion
aad5058d25 Implement KeepAlive for WebSockets 2020-04-27 22:39:37 +02:00
Vasily
655208d375 Now parse date in header correctly as being in UTC 2020-04-27 19:03:42 +03:00
Mark Monteiro
93649ad77b Merge remote-tracking branch 'upstream/master' into simplify-https-config 2020-04-26 11:44:42 -04:00
Bond-009
07326c1d9b
Merge branch 'master' into fix-auth-response-codes 2020-04-22 13:16:08 +02:00
Bond_009
7f4a229cd2 Add some simple tests 2020-04-20 10:18:12 +02:00
dkanada
d62bd7fecd
fix spelling error 2020-04-19 11:46:22 +09:00
Vasily
95dc99fdbd
Update Emby.Server.Implementations/HttpServer/HttpResultFactory.cs
Co-Authored-By: Bond-009 <bond.009@outlook.com>
2020-04-16 01:03:29 +03:00
Vasily
9df49cc796 Make Last-Modified and If-Modified-Since headers follow the spec 2020-04-14 01:52:43 +03:00
Mark Monteiro
8b4b4b4127 Do not return the exception message to the client for AuthenticationExceptions 2020-04-13 16:10:55 -04:00
Mark Monteiro
a8c3951c17 Only show developer exception page for 500 server exceptions
Other response codes should be returned as normal
2020-04-13 15:26:49 -04:00
Mark Monteiro
53380689ad Return correct status codes for authentication and authorization errors
- Use AuthenticatonException to return 401
- Use SecurityException to return 403
- Update existing throws to throw the correct exception for the circumstance
2020-04-13 13:17:46 -04:00
Mark Monteiro
6d35dd6b32 Clean up SecurityException
- Remove unused SecurityExceptionType
- Add missing constructor for InnerException
- Add missing documentation
2020-04-13 13:13:48 -04:00
Vasily
3bdb5e80a5 More consise error messages 2020-04-13 00:57:11 +03:00
Vasily
058c35e739 Fix log highlithing 2020-04-12 23:40:34 +03:00
Vasily
30f4392872 Fix condition flipped by https://github.com/jellyfin/jellyfin/pull/2635 2020-04-12 23:35:41 +03:00
Vasily
61d9c9df5b Addressing review feedback 2020-04-12 23:26:45 +03:00
Vasily
71d8e66d9f Add logging of URL being processed when logging an error
This might help diagnosing stuff like "Operation was cancelled"
2020-04-06 14:42:41 +03:00
Mark Monteiro
387fa474aa Document HTTPS configuration options 2020-04-02 17:45:33 -04:00
Mark Monteiro
ca71ac72ab Replace EnableHttps and SupportsHttps with ListenWithHttps and CanConnectWithHttps 2020-04-02 17:45:04 -04:00
Mark Monteiro
de634203d8 Put Boolean operators at beginning of lines instead of the end 2020-04-02 14:31:56 -04:00
Mark Monteiro
eadad73117 Merge branch 'master' into use-development-exception-page 2020-04-02 13:51:53 -04:00
Mark Monteiro
123bfbcf19 Merge remote-tracking branch 'upstream/master' into use-development-exception-page 2020-04-01 23:09:55 +02:00
Mark Monteiro
5b1091db27 Merge remote-tracking branch 'upstream/master' into do-not-instantiate-services-at-startup 2020-04-01 23:05:36 +02:00