Commit graph

77 commits

Author SHA1 Message Date
Henry Jameson
4349a83b9d Merge remote-tracking branch 'origin/develop' into shigusegubu
* origin/develop: (295 commits)
  update frontend
  Fix uploads test.
  fix text field
  don't re-use build
  Fix tagging problems for existing instances.
  Alias Kocaptcha in the test
  Use :ets.match_delete to delete old captchas
  Switch to phoenixframework/phoenix as the needed change is merged.
  Integration tests for mastodon websocket
  Cowboy handler for Mastodon WebSocket
  Support both OAuth token record and token string in UserView
  minutes->seconds_retained in config.md
  Clean captchas up periodically, not schedule it after theyre created
  Fix captcha tests
  Change minutes_retained config to seconds_retained
  Make the hosted kocaptcha the default value
  Add a configurable auto-cleanup for captchas
  More put_view.
  Use bindings dbuser and dbname in sample_psql.eex
  Upgrade to Phoenix 1.4
  ...
2018-12-18 07:32:00 +03:00
scarlett
4b40e4188c Simplify the NetBSD rc script. 2018-12-16 13:15:37 +00:00
scarlett
9d3eda1959 Add an rc.d script for NetBSD. 2018-12-16 12:33:50 +00:00
nonlinear
75f2177d5b Update/add OpenBSD config files 2018-12-15 14:00:00 -08:00
nonlinear
04513a13e0 Added init file for OpenBSD 2018-12-14 13:13:14 -08:00
Mark Felder
d56772c813 proxy buffering still needs to be off 2018-12-12 17:36:00 +00:00
Mark Felder
48c4f88ffd Update proxy config to improve behavior and allow compatibility with Safari on MacOS and iOS 2018-12-12 17:31:47 +00:00
href
97b00d366f
reverse_proxy: more headers 2018-11-30 18:00:57 +01:00
Henry Jameson
f077d41b12 Merge remote-tracking branch 'origin/develop' into shigusegubu
* origin/develop: (92 commits)
  Web.MastodonApi.MastodonSocketTest: Add test for unauthenticated websocket
  Web.Streamer: Get unauthenticated statuses representation
  Web.MastodonAPI.MastodonSocket: Put access_token at function-level
  Web.MastodonAPI.MastodonSocket: Add unauthentified websocket endpoints
  Improved version string
  mediaproxy: fix empty url & add some tests
  RetryQueue: tiny refractor, add tests
  Various runtime configuration fixes
  update pleroma frontend
  Federator: add retry queue.
  activitypub: object view: avoid leaking private details
  ostatus controller: respond with AS2 objects instead of activities to notice URIs
  tests: federator: fix formatting
  activitypub: transmogrifier: make deletes secure
  Web.AdminAPI.AdminAPIControllerTest: New Test
  Web.AdminAPI.AdminAPIController: Fixes bugs found with ExUnit
  test/plugs/user_is_admin_plug_test: New test
  lib/mix/tasks/relay*: Use a with block
  Change Relay from `status` to `{status, message}`
  Web.Router: Change right to permission group (except for function names)
  ...
2018-11-26 17:52:07 +03:00
lambda
c3f562a611 Merge branch 'add-MIX_ENV-to-systemd-example' into 'develop'
Add MIX_ENV=prod to systemd example file

See merge request pleroma/pleroma!445
2018-11-13 12:24:29 +00:00
shibayashi
124a9bb7a5
Add MIX_ENV=prod 2018-11-12 23:01:06 +01:00
Henry Jameson
bc0f261f72 Merge remote-tracking branch 'origin/develop' into shigusegubu
* origin/develop: (207 commits)
  Update README.md
  Mastodon API: Fix list streaming
  nginx example config: remove CORS headers, now managed by CORSPlug.
  config: properly configure CORSPlug.
  oauth: fix token decode regression
  tests: add test for internal data stripping
  activitypub: transmogrifier: sanitize internal representation details from outgoing objects
  lib/mix/tasks: s/@doc/@moduledoc/
  lib/mix/tasks/unsubscribe_user.ex: Fix syntax from bad line copy
  lib/mix/tasks: Add remaining documentation for mix tasks
  config/config.md: Add lines inspired/copied from CONFIGURATION.md
  README.md: Add note about config/config.md
  README.md: Put the systemd’s .service note to the relevant section
  README.md: Add note for OpenRC
  config/config.md: scope_options_enabled also addresses subject
  config/config.md: Fill all the blanks
  config/config.md: Complete it [WIP]
  config/config.md: Create
  Document the mix tasks in ex_doc instead
  Document mix tasks
  ...
2018-11-12 16:17:34 +03:00
William Pitcock
e4bd5a6950 example configs: kill STS/CT headers 2018-11-11 06:56:46 +00:00
William Pitcock
057a9017b3 example configs: remove obsolete CSP configuration 2018-11-11 06:12:26 +00:00
William Pitcock
fd918863aa nginx example config: remove CORS headers, now managed by CORSPlug. 2018-11-11 05:42:30 +00:00
kaniini
e1c40b8ca2 Merge branch 'patch-2' into 'develop'
Remove Access-Control-Allow-Origin in pleroma.nginx

See merge request pleroma/pleroma!424
2018-11-06 21:24:16 +00:00
Hakaba Hitoyo
3ea4f9ac8d Remove Access-Control-Allow-Origin 2018-11-05 04:18:43 +00:00
shibayashi
800d233631
Use example.tld so a single search and replace works 2018-11-04 14:06:18 +01:00
shibayashi
941f9a888c
Update instructions 2018-11-03 23:59:52 +01:00
shibayashi
732d3fce73
Use the same example domain in all config examples 2018-11-03 23:44:26 +01:00
shibayashi
56c49513e0
Use the server name as variable 2018-11-03 23:41:37 +01:00
shibayashi
043cb7138e
Add a little bit more detail in the comments. 2018-10-25 00:57:47 +02:00
shibayashi
0a58428de6
Add some security related directives to the systemd service example 2018-10-25 00:37:31 +02:00
barrucadu
a32e013909 Relax form-action content security policy
'self' only allows forms submitted to the same origin, which
breaks the "remote follow" form.  To allow remote following,
we want to allow forms to be submitted to any host.
2018-09-28 22:17:19 +00:00
Henry Jameson
d5e4b906c9 Merge remote-tracking branch 'origin/develop' into shigusegubu
* origin/develop: (129 commits)
  Uploaders.S3: Replace unsafe characters in object key
  update pleroma frontend
  test: add smoketests for the scrubbing policies
  html: twittertext: add missing catchall scrub function
  twitter api: add no_rich_text option to userview for account prefs
  test: add tests for new User.html_filter_policy()
  mastodon api: formatting
  twitter api: add support for disabling rich text
  mastodon api: add support for user-supplied html policy
  twitter api: add support for user-specified html policy
  user: add User.html_filter_policy()
  html: default to using normal scrub policy if provided scrub policy is nil
  mix: remove fix_ap_users task, now obsolete
  test: add test proving that users are refreshed when stale
  user: implement dynamic refresh of profiles (gets rid of need for fix_ap_users task)
  Update mastodon frontend
  [Pleroma.Web.MastodonAPI.MastodonAPIController]: Bump mastodon_api_level to 2.5.0
  [Pleroma.Web.MastodonAPI.MastodonAPIController]: Remove unused variables
  [Pleroma.Web.Router]: Fake /api/v1/endorsements
  [Pleroma.Web.MastodonAPI.AccountView]: relationship.json: fake endorsed value (false)
  ...
2018-09-25 16:18:28 +03:00
shibayashi
8a4e2f48bf
installation/pleroma-apache.conf: OCSP stapling needs to be outside of the virtualhost directive 2018-09-03 21:41:21 +02:00
shibayashi
d027c53d75
Add frame-ancestors 'none' to all configs 2018-08-30 11:10:16 +02:00
shibayashi
d035566116
installation/pleroma.nginx: Add 'always' to the security headers, so that they are included regardless of the status code 2018-08-29 19:00:40 +02:00
SGSGB
dae06c0944 Merge remote-tracking branch 'origin/develop' into shigusegubu 2018-08-29 12:08:34 +02:00
shibayashi
64388c420a
installation/pleroma-apache.conf: Add TLS configuration and security headers 2018-08-29 01:29:04 +02:00
shibayashi
3487e15963
installation/pleroma.vcl: Add HTTP security headers 2018-08-29 01:28:10 +02:00
shibayashi
82e661cd07
installation/caddyfile-pleroma.example: Add Content-Security-Policy 2018-08-29 01:16:13 +02:00
Haelwenn (lanodan) Monnier
0fd2eaf7af
installation/pleroma.nginx: Add Content-Security-Policy
Closes: https://git.pleroma.social/pleroma/pleroma/issues/266
2018-08-28 20:54:50 +02:00
shibayashi
bff5ed154f
Improve example Caddyfile 2018-08-26 03:36:52 +02:00
vaartis
9c5ca9e15e Add an OpenRC service 2018-08-23 19:34:11 +03:00
Pleroma
fe8ec1b6f9 shigusegubu customs 2018-07-06 18:59:00 +02:00
Artik Banana
394d0c94c4 Add comment about TLS curves for older servers. 2018-06-16 18:14:05 +00:00
dex
750cfbf38d * fix nginx 1.15 warning:
nginx: [warn] the "ssl" directive is deprecated, use the "listen ... ssl" directive instead
2018-06-13 09:54:23 +00:00
Artik Banana
93c614bf13 * Removed TLSv1 and TLSv1.1
* Added OCSP Stapling
* Added SSL Cache
* Changed ciphers
* Specified ECDH curves
2018-06-11 23:01:14 +00:00
Artik Banana
c645a8de2b Security upgrades:
* Removed TLSv1 and TLSv1.1
* Added OCSP Stapling
* Added SSL Cache
* Changed ciphers
* Specified ECDH curves
2018-06-11 22:56:54 +00:00
witti
13925e0eb3 caddy config example 2018-06-03 20:13:33 +02:00
Dominik V. Salonen
a6fd9c4b00 Update pleroma.nginx
proxy_ignore_client_abort will continue to fetch from upstream even if a client aborts the connection. This is highly recommended when cache is being used. If a client leaves/refreshes the page while a user's avatar or some other media is halfway loaded, the cached copy might in some cases be broken. Leaving future requests to the same URL broken until cache expires.
2018-05-28 10:36:27 +00:00
Niklas Poslovski
f0e8194a71 Repair some access-control headers required for third-party webclients 2018-05-23 08:48:28 +02:00
Niklas Poslovski
d81a4e9280
Add access-control-expose-headers to Nginx default config 2018-05-22 15:39:29 +02:00
lambda
bb864e96ad Merge branch 'patch-2' into 'develop'
Nginx config - secure defaults

See merge request pleroma/pleroma!146
2018-05-13 08:39:37 +00:00
lambda
17bcff6445 Merge branch 'feld-varnish' into 'develop'
More varnish fixes

See merge request pleroma/pleroma!149
2018-05-13 08:34:58 +00:00
Normandy
38f5f6f659 Remove alias directive in service file
Systemd will complain otherwise.
2018-05-11 05:19:20 +00:00
Mark Felder
a85d051675 Don't strip headers from backend for /notice/ either 2018-05-07 23:44:40 +00:00
Mark Felder
4233b1504f Caching notice URLs does not produce pleasant results 2018-05-07 23:43:27 +00:00
lambda
a9baf955fa Merge branch 'feld-varnish' into 'develop'
Caching /objects/ URLs breaks them in Mastoweb as they don't redirect to the /notice/

See merge request pleroma/pleroma!110
2018-05-06 18:43:57 +00:00