Commit graph

97 commits

Author SHA1 Message Date
Henry Jameson
c7ccd43500 shitfuck 2019-03-21 20:39:46 +02:00
Henry Jameson
580787d360 piece of shit 2019-03-21 20:35:52 +02:00
Henry Jameson
ae07bb4779 Merge remote-tracking branch 'origin/develop' into shigusegubu
* origin/develop: (208 commits)
  Web.OAuth.OAuthControllerTest: Add test against token formatting
  Web.OAuth.OAuthController: Fix scopes Enum.join for OAuth response
  activitypub: fix date header format
  Added migration for setting default tags in existing users records
  config: fix chat endpoint path
  mastodon websocket: return errors using ok, not stop
  mastodon websocket: bring back infinity timeout
  mastodon websocket: use pattern match to get query data, robustly handle errors
  config: update config for cowboy 2 endpoints
  mastodon api: websocket: update code for cowboy 2.x
  mix: update dependencies for cowboy 2.0
  Renamed *DatabaseAuthenticator to *Authenticator.
  Added `auth_template/0` to DatabaseAuthenticator.
  Made auth customization be runtime-configurable.
  Added deactivated to the user view
  Remove parts of the old activity view.
  Add user muted status info to twitterapi.
  Add user muted status info to MastodonAPI.
  Add `with_muted` param.
  Follower requests: Utilize object index.
  ...
2019-03-02 20:20:45 +02:00
Kenneth Zhao
e1bdaaa3fe need to put back ipv4 listen instruct 2019-02-26 08:41:37 -08:00
PEA
d3a6c065a4 Add ipv6 handling to pleroma.nginx
Replaces `listen 80` with `listen [::]:80`, same with 443
2019-02-25 23:37:46 -05:00
faried nawaz
c75e643a72
apache config: add instructions for mediaproxy. 2019-02-23 00:18:03 +05:00
shibayashi
d1752a81a8 Update service files of OpenRC and systemd to new recommended paths 2019-02-10 19:25:34 +00:00
shibayashi
1d8b578bb7
Recommend the acme-challenge path that is used in the installation guides 2019-02-09 23:08:27 +01:00
shibayashi
e868cfe619 Add /media to Caddy cache 2019-02-09 11:39:01 +00:00
Henry Jameson
f1bb6b6bc4 Merge remote-tracking branch 'origin/develop' into shigusegubu
* origin/develop: (280 commits)
  Mark streaming feature for Apps in README.md
  Update README.md
  hide_followings was renamed to hide_followers in the FE, but never synced up in the BE
  tests: add a rich media card that contains all relevant fields
  test: add some regression tests for the rich media card rendering
  mastodon api: rich media: don't clobber %URI struct with a string
  adds a couple of explicit examples for ExSyslogger
  Fix if clause in activity_pub user_view
  rids the duplicate timestamp from default ExSyslogger config
  update frontend
  Allow to configure visibility for admin and moderator badges
  Add is_admin and is_moderator boolean fields to the user view
  rich media: parser: reject any data which cannot be explicitly encoded into JSON
  test: twitterapi: fix another possible test failure case
  test: twitterapi: fix the test breakage for real
  mastodon api: fix rendering of cards without image URLs (closes #597)
  Fix SQL
  ARGLE GARBLE
  html: don't attempt to parse nil content
  activitypub: transmogrifier: fix bare tags
  ...
2019-02-08 10:08:36 +02:00
vaartis
9e43a28bc3 Update the openrc service's retry with the correct format 2019-01-28 08:18:11 +00:00
Henry Jameson
f314d1b9d5 Merge remote-tracking branch 'origin/develop' into shigusegubu
* origin/develop: (194 commits)
  Mix.Tasks.Pleroma.Instance: Generate signing_salt
  Send delete event over Mastodon streaming api
  Add a test to ensure #39 is fixed.
  update frontend
  Set custom similarity limit.
  Make use of the indices.
  test: add regression test for to/cc clobbering
  [#477] User trigram index adjustment.
  [#477] User: FTS and trigram search results mixing (to handle misspelled requests).
  [#491] Made full nicknames be preserved in user links text only in Bio.
  activitypub: add a match clause for objects, not just activities
  activitypub: transmogrifier: do not clobber the addressing on relayed announcements
  activitypub: allow is_public?() to work on any type of map representing an AS2 object
  activitypub: relay: chase selective public announce changes
  activitypub: announce: add new public parameter
  Add comments and change default path of the Mix binary.
  Fix bad link in likes collection
  [#502] Fixed `user_count` in `/api/v1/instance` to include only active local users.
  formatting
  Default to disabled in the code in case the setting is absent from config.exs
  ...
2019-01-21 14:35:25 +03:00
shibayashi
2a818a3e77
Add comments and change default path of the Mix binary. 2019-01-17 19:49:54 +01:00
kaniini
c445c9e125 Merge branch 'fix-nginx-caching' into 'develop'
Fix nginx caching issues

See merge request pleroma/pleroma!654
2019-01-14 07:25:08 +00:00
Mark Felder
cc3a83a730 Fix nginx caching issues
Nginx is currently not caching data because proxy_buffering needs to be
enabled for caching to work at all, and we are receiving a Cache-Control
header from Pleroma that states "max-age=0, private, must-revalidate"

Even disregarding the Cache-Control header that should actually be set
to "public, max-age=1209600" as defined in the reverse_proxy code, we
don't want to obey this header at all as it overrides our Nginx caching
rules.
2019-01-10 21:29:05 +00:00
Mark Felder
efaa41fad2 Consistent intentation 2019-01-10 18:29:36 +00:00
Mark Felder
fda942c329 Cache partial objects for 10 minutes
This enables caching/streaming of chunked responses
2019-01-10 18:28:14 +00:00
Mark Felder
ce224ba5f0 Streaming is enabled by default
Support more filetypes for caching static media
2019-01-10 18:23:22 +00:00
kaniini
89fbed8821 Merge branch 'systemd-drop-sysadmin-privilege' into 'develop'
Security/Drops the sysadmin privilege from the daemon

See merge request pleroma/pleroma!604
2018-12-28 20:14:29 +00:00
shibayashi
64035201b5
Security/Drops the sysadmin privilege from the daemon 2018-12-28 21:09:48 +01:00
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