Skip to content

Commit 5267e20

Browse files
committed
update headers and footers, update config for /.well-known routes
1 parent 85ca0d0 commit 5267e20

6 files changed

Lines changed: 46 additions & 15 deletions

File tree

configuration/application.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ ovsx:
137137
enabled: false
138138
primary-service: aws
139139
webui:
140-
frontendRoutes: "/extension/**,/namespace/**,/user-settings/**,/admin-dashboard/**,/about,/publisher-agreement-*,/terms-of-use,/members,/adopters,/error"
140+
frontendRoutes: "/extension/**,/namespace/**,/user-settings/**,/admin-dashboard/**,/about,/publisher-agreement-*,/terms-of-use,/members,/adopters,/error,/.well-known/**"
141141
eclipse:
142142
base-url: https://api.eclipse.org/
143143
publisher-agreement:

website/src/about.tsx

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -61,12 +61,7 @@ const About = () => {
6161

6262
<Heading variant='h5'>Contact Us</Heading>
6363
<Paragraph variant='body1'>
64-
To report malicious extensions, extensions with known vulnerabilities, or other urgent matters, connect with us
65-
at&nbsp;
66-
<Link color='secondary' underline='hover' href='mailto:openvsx@eclipse-foundation.org'>
67-
openvsx@eclipse-foundation.org
68-
</Link>
69-
. For non-urgent questions, including managing namespaces or publishing extensions, please visit our&nbsp;
64+
For non-urgent questions, including managing namespaces or publishing extensions, please visit our&nbsp;
7065
<Link color='secondary' underline='hover' href='https://github.com/EclipseFdn/open-vsx.org/wiki'>
7166
wiki
7267
</Link>

website/src/footer-content.tsx

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,9 @@ const MainFooter = ({ isSmallDisplay, isLargeDisplay, expanded, toggleExpanded }
6262
{isSmallDisplay ? null : repositoryLink()}
6363
{isLargeDisplay ? (
6464
<Box display='flex'>
65-
<Box>{privacyPolicy()}</Box>
65+
<Box>{ossAccess()}</Box>
66+
<Box ml={itemSpacing}>{privacyPolicy()}</Box>
67+
<Box ml={itemSpacing}>{securityPolicy()}</Box>
6668
<Box ml={itemSpacing}>{termsOfUse()}</Box>
6769
<Box ml={itemSpacing}>{compliance()}</Box>
6870
<Box ml={itemSpacing}>{legalResources(false)}</Box>
@@ -102,7 +104,9 @@ const FooterContent: FunctionComponent<{ expanded: boolean }> = ({ expanded }) =
102104
return (
103105
<Box display='flex' flexDirection='column' alignItems='stretch'>
104106
<Box display='flex' flexDirection='column' alignItems='flex-end'>
107+
<Box mb={itemSpacing}>{ossAccess()}</Box>
105108
<Box mb={itemSpacing}>{privacyPolicy()}</Box>
109+
<Box mb={itemSpacing}>{securityPolicy()}</Box>
106110
<Box mb={itemSpacing}>{termsOfUse()}</Box>
107111
<Box mb={itemSpacing}>{compliance()}</Box>
108112
<Box mb={itemSpacing}>{legalResources(isSmallDisplay)}</Box>
@@ -135,12 +139,24 @@ const repositoryLink = () => (
135139
</Link>
136140
);
137141

142+
const ossAccess = () => (
143+
<Link href='https://managed.open-vsx.org/contact' sx={[styles.link, styles.legalText]}>
144+
OSS Access
145+
</Link>
146+
);
147+
138148
const privacyPolicy = () => (
139149
<Link href='https://www.eclipse.org/legal/privacy/' sx={[styles.link, styles.legalText]}>
140150
Privacy Policy
141151
</Link>
142152
);
143153

154+
const securityPolicy = () => (
155+
<Link href='/security/' sx={[styles.link, styles.legalText]}>
156+
Security Policy
157+
</Link>
158+
);
159+
144160
const termsOfUse = () => <LegalLink to='/terms-of-use'>Terms of Use</LegalLink>;
145161

146162
const compliance = () => (

website/src/main.tsx

Lines changed: 18 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,14 @@
1111
import { createRoot } from 'react-dom/client';
1212
import { FunctionComponent, useMemo } from 'react';
1313
import { HelmetProvider } from 'react-helmet-async';
14-
import { BrowserRouter } from 'react-router-dom';
14+
import { BrowserRouter, Navigate } from 'react-router-dom';
1515
import { ThemeProvider } from '@mui/material/styles';
1616
import useMediaQuery from '@mui/material/useMediaQuery';
1717
import { Main, ExtensionRegistryService } from 'openvsx-webui';
1818
import createDefaultTheme from 'openvsx-webui/lib/default/theme';
1919
import createPageSettings from './page-settings';
2020
import { createAbsoluteURL } from 'openvsx-webui/lib/utils';
21+
import { Route, Routes } from 'react-router-dom';
2122

2223
const App: FunctionComponent = () => {
2324
const prefersDarkScheme = useMediaQuery('(prefers-color-scheme: dark)');
@@ -48,11 +49,22 @@ const App: FunctionComponent = () => {
4849
return (
4950
<HelmetProvider>
5051
<ThemeProvider theme={theme}>
51-
<Main
52-
service={service}
53-
pageSettings={pageSettings}
54-
loginProviders={{ github: createAbsoluteURL([serverUrl, 'oauth2', 'authorization', 'github']) }}
55-
/>
52+
<Routes>
53+
<Route
54+
path='/security'
55+
element={<Navigate to='https://researcher-recognition.open-vsx.org/open-vsx-security-policy/' />}
56+
/>
57+
<Route
58+
path='*'
59+
element={
60+
<Main
61+
service={service}
62+
pageSettings={pageSettings}
63+
loginProviders={{ github: createAbsoluteURL([serverUrl, 'oauth2', 'authorization', 'github']) }}
64+
/>
65+
}
66+
/>
67+
</Routes>
5668
</ThemeProvider>
5769
</HelmetProvider>
5870
);

website/src/menu-content.tsx

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ import PeopleAltIcon from '@mui/icons-material/PeopleAlt';
3333
import HubIcon from '@mui/icons-material/Hub';
3434
import AccountBoxIcon from '@mui/icons-material/AccountBox';
3535
import BusinessIcon from '@mui/icons-material/Business';
36+
import SecurityIcon from '@mui/icons-material/Security';
3637
import { UserSettingsRoutes } from 'openvsx-webui/lib/pages/user/user-settings-routes';
3738
import { MainContext } from 'openvsx-webui/lib/context';
3839
import {
@@ -90,6 +91,12 @@ export const MobileMenuContent: FunctionComponent = () => {
9091
Commercial Usage
9192
</MenuItemText>
9293
</MenuItem>
94+
<MenuItem component={Link} href='https://researcher-recognition.open-vsx.org'>
95+
<MenuItemText>
96+
<SecurityIcon sx={itemIcon} />
97+
Report a Vulnerability
98+
</MenuItemText>
99+
</MenuItem>
93100
<MenuItem component={Link} href='https://github.com/EclipseFdn/open-vsx.org/wiki'>
94101
<MenuItemText>
95102
<MenuBookIcon sx={itemIcon} />
@@ -176,6 +183,7 @@ export const DefaultMenuContent: FunctionComponent = () => {
176183
return (
177184
<>
178185
<MenuLink href='https://managed.open-vsx.org/'>Commercial Usage</MenuLink>
186+
<MenuLink href='https://researcher-recognition.open-vsx.org'>Report a Vulnerability</MenuLink>
179187
<MenuLink href='https://github.com/EclipseFdn/open-vsx.org/wiki'>Documentation</MenuLink>
180188
<MenuLink href='https://status.open-vsx.org/'>Status</MenuLink>
181189
<MenuTypography onClick={toggleWorkingGroupMenu} ref={workingGroupMenuEl}>

website/src/page-settings.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -215,7 +215,7 @@ export default function createPageSettings(
215215
);
216216
return (
217217
<Link
218-
href={`mailto:openvsx@eclipse-foundation.org?subject=Report%20Abuse%20-%20${extension.namespace}.${extension.name}&Body=${reportAbuseText}%0A%0A${extensionURL}`}
218+
href={`mailto:security@open-vsx.org?subject=Report%20Abuse%20-%20${extension.namespace}.${extension.name}&Body=${reportAbuseText}%0A%0A${extensionURL}`}
219219
variant='body2'
220220
color='secondary'
221221
underline='hover'

0 commit comments

Comments
 (0)