Haelwenn (lanodan) Monnier [Sat, 10 Nov 2018 14:08:03 +0000 (15:08 +0100)]
lib/mix/tasks/relay_{un,}follow.ex: Use a with block
Haelwenn (lanodan) Monnier [Sat, 10 Nov 2018 13:55:49 +0000 (14:55 +0100)]
lib/pleroma/web/admin_api/admin_api_controller.ex: Support status reply of Relay.{un,}follow
Haelwenn (lanodan) Monnier [Sat, 10 Nov 2018 13:55:32 +0000 (14:55 +0100)]
lib/mix/tasks/relay_{un,}follow.ex: Support status reply of Relay.{un,}follow
Haelwenn (lanodan) Monnier [Sat, 10 Nov 2018 13:49:02 +0000 (14:49 +0100)]
Pleroma.Web.ActivityPub.Relay: make {un,}follow return :ok only if it worked, :error if it didn’t
Haelwenn (lanodan) Monnier [Sat, 10 Nov 2018 13:43:22 +0000 (14:43 +0100)]
lib/pleroma/plugs/user_is_admin_plug.ex: change 403 string to “User is not admin.”
Haelwenn (lanodan) Monnier [Sat, 10 Nov 2018 13:42:34 +0000 (14:42 +0100)]
lib/pleroma/web/admin_api/admin_api_controller.ex: An admin cannot un-admin themselves
Haelwenn (lanodan) Monnier [Fri, 2 Nov 2018 07:30:52 +0000 (08:30 +0100)]
Pleroma.Web.AdminAPI.AdminAPIController: user_create statement format
Haelwenn (lanodan) Monnier [Fri, 2 Nov 2018 07:19:56 +0000 (08:19 +0100)]
Add get endpoints for rights [AdminAPI]
Haelwenn (lanodan) Monnier [Fri, 2 Nov 2018 07:15:09 +0000 (08:15 +0100)]
Fix connection returns make generic right endpoint [AdminAPI]
Haelwenn (lanodan) Monnier [Fri, 12 Oct 2018 04:43:08 +0000 (06:43 +0200)]
admin_api_controller.ex: fix remaining params at once
Haelwenn (lanodan) Monnier [Fri, 12 Oct 2018 04:37:37 +0000 (06:37 +0200)]
admin_api_controller.ex: Add documentation, fix get_invite_token
Haelwenn (lanodan) Monnier [Fri, 12 Oct 2018 04:28:20 +0000 (06:28 +0200)]
admin_api_controller.ex: get_password_reset: fix params and response
Haelwenn (lanodan) Monnier [Fri, 12 Oct 2018 04:26:58 +0000 (06:26 +0200)]
lib/pleroma/web/admin_api/admin_api_controller.ex: Pleroma.Web.AdminAPI.Controller → Pleroma.Web.AdminAPI.AdminAPIController
Haelwenn (lanodan) Monnier [Fri, 12 Oct 2018 04:25:50 +0000 (06:25 +0200)]
[Pleroma.Plugs.UserIsAdminPlug]: Check if admin is true instead of false, fix error reporting
Haelwenn (lanodan) Monnier [Fri, 12 Oct 2018 03:12:09 +0000 (05:12 +0200)]
lib/mix/tasks/make_admin.ex: New task
Haelwenn (lanodan) Monnier [Tue, 2 Oct 2018 17:13:21 +0000 (19:13 +0200)]
lib/pleroma/plugs/user_is_admin_plug.ex: Create
Haelwenn (lanodan) Monnier [Tue, 2 Oct 2018 17:03:05 +0000 (19:03 +0200)]
admin_api_controller: Have some basic code
Haelwenn (lanodan) Monnier [Tue, 2 Oct 2018 16:38:16 +0000 (18:38 +0200)]
admin_api_controller.ex: Create
lambda [Sat, 17 Nov 2018 18:33:09 +0000 (18:33 +0000)]
Merge branch 'security/actor-containment' into 'develop'
security hotfix: actor containment
See merge request pleroma/pleroma!460
William Pitcock [Sat, 17 Nov 2018 18:24:58 +0000 (18:24 +0000)]
tests: add a second spoofing variant
William Pitcock [Sat, 17 Nov 2018 18:17:17 +0000 (18:17 +0000)]
activitypub: fetch_object_from_id(): prefer `actor` over `attributedTo` to avoid spoofing
William Pitcock [Sat, 17 Nov 2018 18:16:55 +0000 (18:16 +0000)]
test: fix more test defects
William Pitcock [Sat, 17 Nov 2018 18:12:11 +0000 (18:12 +0000)]
tests: add additional spoofing tests
William Pitcock [Sat, 17 Nov 2018 18:11:31 +0000 (18:11 +0000)]
transmogrifier tests: fix defective spoofing test
William Pitcock [Sat, 17 Nov 2018 17:42:47 +0000 (17:42 +0000)]
test: httpoison mock: add second spoofing activity test
kaniini [Sat, 17 Nov 2018 16:41:09 +0000 (16:41 +0000)]
Merge branch 'feature/uploader-mdii' into 'develop'
Feature / MDII Uploader
See merge request pleroma/pleroma!454
hakabahitoyo [Sat, 17 Nov 2018 11:16:25 +0000 (20:16 +0900)]
fallbacking into local uploader
hakabahitoyo [Sat, 17 Nov 2018 09:14:42 +0000 (18:14 +0900)]
better config reading
kaniini [Fri, 16 Nov 2018 23:34:43 +0000 (23:34 +0000)]
Merge branch 'bugfix/dm-timeline-scope' into 'develop'
TwitterAPI: Fix dm_timeline displaying only half of the conversation.
See merge request pleroma/pleroma!457
lain [Fri, 16 Nov 2018 18:47:36 +0000 (19:47 +0100)]
TwitterAPI: Fix dm_timeline displaying only half of the conversation.
lambda [Fri, 16 Nov 2018 18:13:47 +0000 (18:13 +0000)]
Merge branch 'feature/pleromafe-usersearch' into 'develop'
Add Twitter / Pleroma API user search
See merge request pleroma/pleroma!452
kaniini [Fri, 16 Nov 2018 17:47:22 +0000 (17:47 +0000)]
Merge branch 'bugfix/csp-remove-form-action' into 'develop'
http security: remove form-action from CSP definitions
Closes #379
See merge request pleroma/pleroma!456
William Pitcock [Fri, 16 Nov 2018 17:40:21 +0000 (17:40 +0000)]
http security: remove form-action from CSP definitions
lain [Fri, 16 Nov 2018 17:31:32 +0000 (18:31 +0100)]
Add better test for user search functionlity.
lambda [Fri, 16 Nov 2018 15:52:38 +0000 (15:52 +0000)]
Merge branch 'fix/test' into 'develop'
Reset http security settings to fix plug test
See merge request pleroma/pleroma!455
AkiraFukushima [Fri, 16 Nov 2018 15:45:21 +0000 (00:45 +0900)]
Reset http security settings to fix plug test
hakabahitoyo [Fri, 16 Nov 2018 11:41:12 +0000 (20:41 +0900)]
better config
hakabahitoyo [Fri, 16 Nov 2018 11:22:36 +0000 (20:22 +0900)]
better extension detection
hakabahitoyo [Thu, 15 Nov 2018 07:08:55 +0000 (16:08 +0900)]
debug
hakabahitoyo [Thu, 15 Nov 2018 06:11:59 +0000 (15:11 +0900)]
format
Hakaba Hitoyo [Thu, 15 Nov 2018 05:46:43 +0000 (14:46 +0900)]
debuf
Hakaba Hitoyo [Thu, 15 Nov 2018 05:38:45 +0000 (14:38 +0900)]
omplement mdii uploader
Hakaba Hitoyo [Thu, 15 Nov 2018 05:19:10 +0000 (14:19 +0900)]
add mdii uploader
Hakaba Hitoyo [Thu, 15 Nov 2018 05:04:09 +0000 (14:04 +0900)]
Merge remote-tracking branch 'official/develop' into develop
Hakaba Hitoyo [Thu, 15 Nov 2018 05:03:52 +0000 (14:03 +0900)]
Revert "update pleroma frontend"
This reverts commit
025301546702a6fe9167e49453c3a9b44607fb75.
lain [Wed, 14 Nov 2018 19:41:12 +0000 (20:41 +0100)]
Format.
lain [Wed, 14 Nov 2018 19:33:23 +0000 (20:33 +0100)]
Add Pleroma user search api for PleromaFE.
lambda [Wed, 14 Nov 2018 18:17:10 +0000 (18:17 +0000)]
Merge branch 'fix-media-proxy-filename' into 'develop'
media_proxy: use path only to retrieve filename
See merge request pleroma/pleroma!450
kaniini [Wed, 14 Nov 2018 16:10:27 +0000 (16:10 +0000)]
Merge branch 'update/pleroma-fe-
20181114' into 'develop'
update pleroma frontend
See merge request pleroma/pleroma!451
William Pitcock [Wed, 14 Nov 2018 16:08:22 +0000 (16:08 +0000)]
update pleroma frontend
kaniini [Wed, 14 Nov 2018 08:52:08 +0000 (08:52 +0000)]
Merge branch 'twitter-api-direct-messages' into 'develop'
Twitter api direct messages
See merge request pleroma/pleroma!449
href [Tue, 13 Nov 2018 22:41:33 +0000 (23:41 +0100)]
media_proxy: use path only to retrieve filename
lain [Tue, 13 Nov 2018 19:08:50 +0000 (20:08 +0100)]
TwitterApi: Add direct message endpoint
lain [Tue, 13 Nov 2018 18:46:34 +0000 (19:46 +0100)]
MastodonAPI: Add pagination to private messages.
lambda [Tue, 13 Nov 2018 15:15:05 +0000 (15:15 +0000)]
Merge branch 'media-proxy-safety' into 'develop'
media_proxy: CSP, content-disposition
See merge request pleroma/pleroma!448
href [Tue, 13 Nov 2018 14:58:02 +0000 (15:58 +0100)]
media_proxy: CSP, content-disposition
* Adds CSP headers to the media proxy endpoint
* Sends `content-disposition: attachment; …` for non-image/video/audio
content types
The default list can be overwritten with `:media_proxy,
:safe_content_types` in the configuration.
* Also now appends the filename to the proxy URL (fixes some mobile apps,
it was requested a while ago)
lambda [Tue, 13 Nov 2018 13:23:04 +0000 (13:23 +0000)]
Merge branch 'security/cookie-hardening' into 'develop'
Add __Host- prefix when secure flag is enabled
See merge request pleroma/pleroma!446
lambda [Tue, 13 Nov 2018 12:24:29 +0000 (12:24 +0000)]
Merge branch 'add-MIX_ENV-to-systemd-example' into 'develop'
Add MIX_ENV=prod to systemd example file
See merge request pleroma/pleroma!445
lambda [Tue, 13 Nov 2018 12:22:41 +0000 (12:22 +0000)]
Merge branch 'whalebird' into 'develop'
Add Whalebird as a client application in README
See merge request pleroma/pleroma!447
shibayashi [Mon, 12 Nov 2018 23:32:38 +0000 (00:32 +0100)]
Add __Host- prefix when secure flag is enabled
shibayashi [Mon, 12 Nov 2018 22:01:06 +0000 (23:01 +0100)]
Add MIX_ENV=prod
scarlett [Mon, 12 Nov 2018 17:08:54 +0000 (17:08 +0000)]
Merge branch 'twitter-api-null-display-name' into 'develop'
Twitter API: Fall back to user.nickname if user has no name
Closes #375
See merge request pleroma/pleroma!444
scarlett [Mon, 12 Nov 2018 16:40:34 +0000 (16:40 +0000)]
Twitter API: Add tests for nil names.
AkiraFukushima [Mon, 12 Nov 2018 16:02:49 +0000 (01:02 +0900)]
Add Whalebird as a client application in README
scarlett [Mon, 12 Nov 2018 15:38:39 +0000 (15:38 +0000)]
Twitter API: Fall back to user.nickname if user has no name
kaniini [Mon, 12 Nov 2018 15:30:42 +0000 (15:30 +0000)]
Merge branch 'feature/csp-plug' into 'develop'
migrate CSP management to CSPPlug
See merge request pleroma/pleroma!441
William Pitcock [Mon, 12 Nov 2018 15:17:04 +0000 (15:17 +0000)]
sample config: chase http_security change
William Pitcock [Mon, 12 Nov 2018 15:14:46 +0000 (15:14 +0000)]
http security: allow referrer-policy to be configured
William Pitcock [Mon, 12 Nov 2018 15:08:02 +0000 (15:08 +0000)]
rename CSPPlug to HTTPSecurityPlug.
Haelwenn [Sun, 11 Nov 2018 16:44:04 +0000 (16:44 +0000)]
Merge branch 'update-readme' into 'develop'
Update README.md
See merge request pleroma/pleroma!443
shibayashi [Sun, 11 Nov 2018 16:31:16 +0000 (17:31 +0100)]
Update README.md
kaniini [Sun, 11 Nov 2018 13:41:48 +0000 (13:41 +0000)]
Merge branch 'fix-list-streaming' into 'develop'
Mastodon API: Fix list streaming
See merge request pleroma/pleroma!442
KokaKiwi [Sun, 11 Nov 2018 03:33:14 +0000 (04:33 +0100)]
Mastodon API: Fix list streaming
William Pitcock [Sun, 11 Nov 2018 07:27:36 +0000 (07:27 +0000)]
config docs: typo fix
William Pitcock [Sun, 11 Nov 2018 07:26:31 +0000 (07:26 +0000)]
tests: add tests for CSPPlug
William Pitcock [Sun, 11 Nov 2018 06:56:46 +0000 (06:56 +0000)]
example configs: kill STS/CT headers
William Pitcock [Sun, 11 Nov 2018 06:53:42 +0000 (06:53 +0000)]
csp plug: add support for certificate transparency
William Pitcock [Sun, 11 Nov 2018 06:50:28 +0000 (06:50 +0000)]
csp plug: add sts support
William Pitcock [Sun, 11 Nov 2018 06:42:14 +0000 (06:42 +0000)]
sample config: document how to make CSPPlug send STS headers (off by default to allow for SSL debugging)
William Pitcock [Sun, 11 Nov 2018 06:37:18 +0000 (06:37 +0000)]
config: add default parameters for CSPPlug
William Pitcock [Sun, 11 Nov 2018 06:12:26 +0000 (06:12 +0000)]
example configs: remove obsolete CSP configuration
William Pitcock [Sun, 11 Nov 2018 06:10:21 +0000 (06:10 +0000)]
plugs: add CSPPlug
kaniini [Sun, 11 Nov 2018 05:49:49 +0000 (05:49 +0000)]
Merge branch 'bugfix/corsplug-config' into 'develop'
properly configure CORSPlug
See merge request pleroma/pleroma!440
William Pitcock [Sun, 11 Nov 2018 05:42:30 +0000 (05:42 +0000)]
nginx example config: remove CORS headers, now managed by CORSPlug.
William Pitcock [Sun, 11 Nov 2018 05:40:55 +0000 (05:40 +0000)]
config: properly configure CORSPlug.
kaniini [Sun, 11 Nov 2018 05:34:45 +0000 (05:34 +0000)]
Merge branch 'bugfix/oauth-padding' into 'develop'
hotfix: oauth: fix token decode regression
Closes #373
See merge request pleroma/pleroma!439
William Pitcock [Sun, 11 Nov 2018 05:11:27 +0000 (05:11 +0000)]
oauth: fix token decode regression
lambda [Sat, 10 Nov 2018 12:37:18 +0000 (12:37 +0000)]
Merge branch 'bugfix/json-ld-object-sanitization' into 'develop'
JSON-LD: object sanitization
See merge request pleroma/pleroma!438
kaniini [Sat, 10 Nov 2018 12:25:08 +0000 (12:25 +0000)]
Merge branch 'feature/documentation' into 'develop'
Add ex_doc documentation to Pleroma
See merge request pleroma/pleroma!416
William Pitcock [Sat, 10 Nov 2018 12:16:10 +0000 (12:16 +0000)]
tests: add test for internal data stripping
William Pitcock [Sat, 10 Nov 2018 12:08:53 +0000 (12:08 +0000)]
activitypub: transmogrifier: sanitize internal representation details from outgoing objects
this causes JSON-LD parsers to get upset and has also lead to developer confusion from outside
projects which tried to parse our internal data. accordingly, it seems better to just remove
it.
Haelwenn (lanodan) Monnier [Thu, 8 Nov 2018 14:28:50 +0000 (15:28 +0100)]
lib/mix/tasks: s/@doc/@moduledoc/
Haelwenn (lanodan) Monnier [Thu, 8 Nov 2018 14:26:11 +0000 (15:26 +0100)]
lib/mix/tasks/unsubscribe_user.ex: Fix syntax from bad line copy
Haelwenn (lanodan) Monnier [Thu, 8 Nov 2018 14:21:09 +0000 (15:21 +0100)]
lib/mix/tasks: Add remaining documentation for mix tasks
Haelwenn (lanodan) Monnier [Thu, 8 Nov 2018 13:59:44 +0000 (14:59 +0100)]
config/config.md: Add lines inspired/copied from CONFIGURATION.md
Haelwenn (lanodan) Monnier [Thu, 8 Nov 2018 13:47:04 +0000 (14:47 +0100)]
README.md: Add note about config/config.md
Haelwenn (lanodan) Monnier [Thu, 8 Nov 2018 13:45:22 +0000 (14:45 +0100)]
README.md: Put the systemd’s .service note to the relevant section
Haelwenn (lanodan) Monnier [Thu, 8 Nov 2018 13:43:42 +0000 (14:43 +0100)]
README.md: Add note for OpenRC
Haelwenn (lanodan) Monnier [Thu, 8 Nov 2018 13:33:05 +0000 (14:33 +0100)]
config/config.md: scope_options_enabled also addresses subject
Haelwenn (lanodan) Monnier [Thu, 8 Nov 2018 13:27:21 +0000 (14:27 +0100)]
config/config.md: Fill all the blanks