Only proxy HTTP and HTTP urls via Media Proxy #860

Merged

floatingghost merged 2 commits from nopjmp/akkoma:media-proxy-only-http into develop 2025-01-03 15:25:14 +00:00

Conversation 7 Commits 2 Files changed 3 +13 -2

nopjmp commented 2024-12-15 22:33:41 +00:00

Contributor

Copy link

We make an assumption that we are only proxying HTTP/HTTPS hosted
media through the media proxy endpoint.

Fixes: #859

We make an assumption that we are only proxying HTTP/HTTPS hosted media through the media proxy endpoint. Fixes: #859

nopjmp commented 2024-12-15 23:52:49 +00:00

Author

Contributor

Copy link

The only test I had issues with was "redirects to media proxy URI in case of thumbnailing error" due to having installed html2ps and it was added as a delegate to ImageMagick allowed for the error to be converted into an image. I uninstalled html2ps and everything passed.

We probably don't want to convert html into any images, so if we don't want that I can look at making another PR to see about removing extra ImageMagick functionality.

The only test I had issues with was "redirects to media proxy URI in case of thumbnailing error" due to having installed html2ps and it was added as a delegate to ImageMagick allowed for the error to be converted into an image. I uninstalled html2ps and everything passed. We probably don't want to convert html into any images, so if we don't want that I can look at making another PR to see about removing extra ImageMagick functionality.

Oneric commented 2024-12-16 11:39:57 +00:00

Owner

Copy link

cosmetic: mix format

Oh right, you’ve mentioned using elixir 1.14, but the style guide slightly changed with 1.15 or 1.16; sorry i forgot about that. Current develop is already mix format clean with current elixir. Apart from the first commit, i can confirm this patch is mix formatclean too, so just drop the first one and everything should be fine; thanks!

> cosmetic: mix format Oh right, you’ve mentioned using elixir 1.14, but the style guide slightly changed with 1.15 or 1.16; sorry i forgot about that. Current `develop` is already `mix format` clean with current elixir. Apart from the first commit, i can confirm this patch is `mix format`clean too, so just drop the first one and everything should be fine; thanks!

nopjmp force-pushed media-proxy-only-http from 8ea721a5f2 to ff5d197341 2024-12-17 02:35:23 +00:00 Compare

nopjmp commented 2024-12-17 02:37:07 +00:00

Author

Contributor

Copy link

fixed, it was unclear what Elixir version I should be using. I'm not super familiar with Elixir so I wasn't aware formatting defaults changed between versions.

fixed, it was unclear what Elixir version I should be using. I'm not super familiar with Elixir so I wasn't aware formatting defaults changed between versions.

Oneric commented 2024-12-17 03:01:44 +00:00

Owner

Copy link

it surprised me too when it happened `^^

it surprised me too when it happened `^^

Oneric approved these changes 2024-12-17 03:01:50 +00:00

floatingghost merged commit 67cdc38296 into develop 2025-01-03 15:25:14 +00:00

floatingghost deleted branch media-proxy-only-http 2025-01-03 15:25:15 +00:00

floatingghost referenced this pull request from a commit 2025-01-03 15:25:15 +00:00

Merge pull request 'Only proxy HTTP and HTTP urls via Media Proxy' (#860) from nopjmp/akkoma:media-proxy-only-http into develop

Oneric referenced this pull request 2025-04-09 19:14:09 +00:00

MediaProxy omits inline imaged without explicit scheme #900

Oneric commented 2025-04-09 19:17:39 +00:00

Owner

Copy link

@nopjmp this may have led to some cases of IP leakage; see: #900
Since I’m not using media proxy, any chance you could take a look at it?

A fix is available here #903, but it’d be appreciated if f you could test it in prod and give feedback on (the absence of) any problems

@nopjmp this may have led to some cases of IP leakage; see: https://akkoma.dev/AkkomaGang/akkoma/issues/900 ~~Since I’m not using media proxy, any chance you could take a look at it?~~ A fix is available here #903, but it’d be appreciated if f you could test it in prod and give feedback on (the absence of) any problems

nopjmp commented 2025-05-02 03:48:54 +00:00

Author

Contributor

Copy link

@Oneric #903 will work fine. I've not see any issues on my instance with the patch but it's very small compared to other Akkoma instances.

@Oneric #903 will work fine. I've not see any issues on my instance with the patch but it's very small compared to other Akkoma instances.

👍 1

Oneric referenced this pull request 2025-05-02 22:46:36 +00:00

mediaproxy: proxy network-path references #903

Sign in to join this conversation.

Reviewers

No reviewers

Oneric

Labels

Clear labels   

approved, awaiting change

  

broken setup

Issue arose from a misconfiguration by the admin, custom patches, manual db edits or similar

  

bug

Something is not working

  

cannot reproduce

  

configuration

This requires config changes

  

documentation

This is about human-readable docs

  

duplicate

This issue or pull request already exists

  

enhancement

New feature

  

extremely low priority

  

feature request

Something new?

  

Fix it yourself

Support has been attempted

  

help wanted

Need some help

  

invalid

Something is wrong

  

mastodon_api

  

needs change/feedback

Issue or PR is stalled on response from the author or a third party

  

needs docs

  

needs tests

  

not a bug

  

not our bug

Bug in a dependency of ours (meaning we can't just fix it), or in another AP implementation or client interfacing with Akkoma (which needs to be fixed on their end)

  

planned

  

pleroma_api

  

privacy

  

question

More information is needed

  

static_fe

  

triage

  

wontfix

This won't be fixed

No labels

approved, awaiting change

broken setup

bug

cannot reproduce

configuration

documentation

duplicate

enhancement

extremely low priority

feature request

Fix it yourself

help wanted

invalid

mastodon_api

needs change/feedback

needs docs

needs tests

not a bug

not our bug

planned

pleroma_api

privacy

question

static_fe

triage

wontfix

Milestone

Clear milestone

No items

No milestone

Projects

Clear projects

No items

No project

Assignees

Clear assignees

No assignees

2 participants

Notifications

Subscribe

Due date

The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set.

Reference

AkkomaGang/akkoma!860

No description provided.