hippoz/cinny
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'master' into phildenhoff/fix-at-sigil-in-localpart

Browse source
This commit is contained in:
Ajay Bura 2021-07-29 11:21:11 +05:30 committed by GitHub
commit 4d3d6ea9a7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 23 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
Dockerfile Normal file
View file

@ -0,0 +1,21 @@
## Builder
FROM node:14-alpine as builder
WORKDIR /src
COPY . /src
RUN npm install \
&& npm run build
## App
FROM nginx:alpine
COPY --from=builder /src/dist /app
COPY --from=builder /src/olm.wasm /app/olm.wasm
# Insert wasm type into Nginx mime.types file so they load correctly.
RUN sed -i '3i\ \ \ \ application/wasm wasm\;' /etc/nginx/mime.types
RUN rm -rf /usr/share/nginx/html \
&& ln -s /app /usr/share/nginx/html

4
src/app/templates/auth/Auth.jsx
View file

@ -16,8 +16,8 @@ import CinnySvg from '../../../../public/res/svg/cinny.svg';
// This regex validates historical usernames, which don't satisy today's username requirements. // This regex validates historical usernames, which don't satisy today's username requirements.
// See https://matrix.org/docs/spec/appendices#id13 for more info. // See https://matrix.org/docs/spec/appendices#id13 for more info.
const LOCALPART_LOGIN_REGEX = /^[!-9|;-~]+$/; const LOCALPART_LOGIN_REGEX = /^[!-9|;-~]+$/;
const LOCALPART_SIGNUP_REGEX = /^[a-z0-9_\-+./]+$/; const LOCALPART_SIGNUP_REGEX = /^[a-z0-9_\-.=/]+$/;
const BAD_LOCALPART_ERROR = 'Username must contain only lowercase letters, numbers, dashes and underscores.'; const BAD_LOCALPART_ERROR = 'Username must contain only a-z, 0-9, ., _, =, -, and /.';
const USER_ID_TOO_LONG_ERROR = 'Your user ID, including the hostname, can\'t be more than 255 characters long.'; const USER_ID_TOO_LONG_ERROR = 'Your user ID, including the hostname, can\'t be more than 255 characters long.';
const PASSWORD_REGEX = /.+/; const PASSWORD_REGEX = /.+/;