Skip to content

fix base64 url safe encoding/decoding #67

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
flatron4eg wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix base64 url safe encoding/decoding #67

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions frontend/src/components/configurationForm/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { FC } from 'react';
import { zodResolver } from '@hookform/resolvers/zod';
import { encode as base64_encode } from 'js-base64';
import { Base64 } from 'js-base64';
import { useForm } from 'react-hook-form';
import { v4 as uuidv4 } from 'uuid';
import {
Expand Down Expand Up @@ -49,7 +49,7 @@ const ConfigurationForm: FC<Props> = ({ servers }) => {
sections.find((s) => s.key === item.key),
);

const encodedConfiguration = base64_encode(JSON.stringify(configuration));
const encodedConfiguration = Base64.encodeURI(JSON.stringify(configuration));
const addonUrl = `${window.location.origin}/${uuidv4()}/${encodedConfiguration}/manifest.json`;

if (event.nativeEvent.submitter.name === 'clipboard') {
Expand Down
8 changes: 7 additions & 1 deletion plexio/dependencies.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,17 @@ def get_http_client(request: Request) -> ClientSession:
def get_cache(request: Request):
return request.state.cache

def base64_url_decode(base64_cfg: str) -> bytes:
padding = len(base64_cfg) % 4
if padding:
base64_cfg += '=' * (4 - padding)

return base64.urlsafe_b64decode(base64_cfg)

def get_addon_configuration(base64_cfg: str | None = None) -> AddonConfiguration | None:
if base64_cfg is None:
return None
decoded = base64.b64decode(base64_cfg)
decoded = base64_url_decode(base64_cfg)
configuration = AddonConfiguration(**json.loads(decoded))
return configuration

Expand Down