openvsx-webui-test 0.18.0-security.5 → 0.19.0-dev.1

package/src/pages/user/user-settings-namespaces.tsx

@@ -8,7 +8,7 @@
  * SPDX-License-Identifier: EPL-2.0
  ********************************************************************************/
 
-import React, { FunctionComponent, useContext, useEffect, useState, useRef, ReactNode } from 'react';
+import { FunctionComponent, useContext, useEffect, useState, useRef, ReactNode } from 'react';
 import { Box, Typography, Tabs, Tab, useTheme, useMediaQuery, Link } from '@mui/material';
 import { Namespace, UserData } from '../../extension-registry-types';
 import { DelayedLoadIndicator } from '../../components/delayed-load-indicator';

package/src/pages/user/user-settings-profile.tsx

@@ -8,7 +8,7 @@
  * SPDX-License-Identifier: EPL-2.0
  ********************************************************************************/
 
-import React, { FunctionComponent, ReactNode, useContext } from 'react';
+import { FunctionComponent, ReactNode, useContext } from 'react';
 import { Theme, Grid, Typography, Avatar } from '@mui/material';
 import { toLocalTime } from '../../utils';
 import { UserData } from '../../extension-registry-types';

package/src/pages/user/user-settings-tokens.tsx

@@ -8,10 +8,8 @@
  * SPDX-License-Identifier: EPL-2.0
  ********************************************************************************/
 
-import React, { FunctionComponent, ReactNode, useContext, useEffect, useState, useRef } from 'react';
-import {
-    Theme, Typography, Box, Paper, Button, Link, Dialog, DialogTitle, DialogContent, DialogContentText, DialogActions
-} from '@mui/material';
+import { FunctionComponent, ReactNode, useContext, useEffect, useState, useRef } from 'react';
+import { Theme, Typography, Box, Paper, Button, Link, Dialog, DialogTitle, DialogContent, DialogContentText, DialogActions } from '@mui/material';
 import { Link as RouteLink } from 'react-router-dom';
 import { DelayedLoadIndicator } from '../../components/delayed-load-indicator';
 import { Timestamp } from '../../components/timestamp';
@@ -107,6 +105,7 @@ export const UserSettingsTokens: FunctionComponent = () => {
             <Box alignItems='center' overflow='auto'>
                 <Typography sx={{ fontWeight: 'bold', overflow: 'hidden', textOverflow: 'ellipsis' }}>{token.description}</Typography>
                 <Typography variant='body2'>Created: <Timestamp value={token.createdTimestamp}/></Typography>
+                <Typography variant='body2'>Expires: {token.expiresTimestamp ? <Timestamp value={token.expiresTimestamp}/> : 'never'}</Typography>
                 <Typography variant='body2'>Accessed: {token.accessedTimestamp ? <Timestamp value={token.accessedTimestamp}/> : 'never'}</Typography>
             </Box>
             <Box display='flex' alignItems='center'>

package/src/pages/user/user-settings.tsx

@@ -8,7 +8,7 @@
  * SPDX-License-Identifier: EPL-2.0
  ********************************************************************************/
 
-import React, { FunctionComponent, ReactNode, useContext } from 'react';
+import { FunctionComponent, ReactNode, useContext } from 'react';
 import { Helmet } from 'react-helmet-async';
 import { Grid, Container, Box, Typography, Link } from '@mui/material';
 import { useParams } from 'react-router-dom';

package/src/server-request.ts

@@ -28,7 +28,7 @@ export interface ErrorResponse {
     trace?: string;
 }
 
-export async function sendRequest<Res>(req: ServerAPIRequest): Promise<Res> {
+export async function sendRequest<Res>(req: ServerAPIRequest, retry: boolean = true): Promise<Res> {
     req.method ??= 'GET';
     req.headers ??= {};
     if (!req.headers['Accept']) {
@@ -50,7 +50,7 @@ export async function sendRequest<Res>(req: ServerAPIRequest): Promise<Res> {
         param.credentials = 'include';
     }
 
-    const options: any = {
+    const options: any = retry ? {
         retries: 10,
         retryDelay: (attempt: number, error: Error, response: Response) => {
             return Math.pow(2, attempt) * 1000;
@@ -58,7 +58,7 @@ export async function sendRequest<Res>(req: ServerAPIRequest): Promise<Res> {
         retryOn: (attempt: number, error: Error, response: Response) => {
             return error !== null || response.status >= 500;
         }
-    };
+    } : {};
 
     const response = await fetchBuilder(fetch, options)(req.endpoint, param);
     if (response.ok) {
@@ -73,7 +73,11 @@ export async function sendRequest<Res>(req: ServerAPIRequest): Promise<Res> {
                 throw new Error(`Unsupported type ${req.headers['Accept']}`);
         }
     } else if (response.status === 429) {
-        const retrySeconds = response.headers.get('X-Rate-Limit-Retry-After-Seconds') ?? '0';
+        // if the server uses the bucket4j starter config
+        const retryAfterSeconds = response.headers.get('X-Rate-Limit-Retry-After-Seconds');
+        // if the server uses the dynamic rate limiting config
+        const retryAfter = response.headers.get('Retry-After');
+        const retrySeconds = retryAfterSeconds ?? retryAfter ?? '0';
         const jitter = Math.floor(Math.random() * 100);
         const timeoutMillis = ((Number(retrySeconds) + 1) * 1000) + jitter;
         return new Promise<ServerAPIRequest>(resolve => setTimeout(resolve, timeoutMillis, req))

package/src/utils.ts

@@ -63,23 +63,46 @@ export function toRelativeTime(timestamp?: string): string | undefined {
     }
     const date = new Date(timestamp);
     const elapsed = Date.now() - date.getTime();
-    if (elapsed < msPerMinute) {
-        return 'now';
-    } else if (elapsed < msPerHour) {
-        const value = Math.round(elapsed / msPerMinute);
-        return `${value} minute${value !== 1 ? 's' : ''} ago`;
-    } else if (elapsed < msPerDay) {
-        const value = Math.round(elapsed / msPerHour);
-        return `${value} hour${value !== 1 ? 's' : ''} ago`;
-    } else if (elapsed < msPerMonth) {
-        const value = Math.round(elapsed / msPerDay);
-        return `${value} day${value !== 1 ? 's' : ''} ago`;
-    } else if (elapsed < msPerYear) {
-        const value = Math.round(elapsed / msPerMonth);
-        return `${value} month${value !== 1 ? 's' : ''} ago`;
+
+    if (elapsed < 0) {
+        const remaining = -elapsed;
+        if (remaining < msPerMinute) {
+            return 'now';
+        } else if (remaining < msPerHour) {
+            const value = Math.round(remaining / msPerMinute);
+            return `in ${value} minute${value !== 1 ? 's' : ''}`;
+        } else if (remaining < msPerDay) {
+            const value = Math.round(remaining / msPerHour);
+            return `in ${value} hour${value !== 1 ? 's' : ''}`;
+        } else if (remaining < msPerMonth) {
+            const value = Math.round(remaining / msPerDay);
+            return `in ${value} day${value !== 1 ? 's' : ''}`;
+        } else if (remaining < msPerYear) {
+            const value = Math.round(remaining / msPerMonth);
+            return `in ${value} month${value !== 1 ? 's' : ''}`;
+        } else {
+            const value = Math.round(remaining / msPerYear);
+            return `in ${value} year${value !== 1 ? 's' : ''}`;
+        }
     } else {
-        const value = Math.round(elapsed / msPerYear);
-        return `${value} year${value !== 1 ? 's' : ''} ago`;
+        if (elapsed < msPerMinute) {
+            return 'now';
+        } else if (elapsed < msPerHour) {
+            const value = Math.round(elapsed / msPerMinute);
+            return `${value} minute${value !== 1 ? 's' : ''} ago`;
+        } else if (elapsed < msPerDay) {
+            const value = Math.round(elapsed / msPerHour);
+            return `${value} hour${value !== 1 ? 's' : ''} ago`;
+        } else if (elapsed < msPerMonth) {
+            const value = Math.round(elapsed / msPerDay);
+            return `${value} day${value !== 1 ? 's' : ''} ago`;
+        } else if (elapsed < msPerYear) {
+            const value = Math.round(elapsed / msPerMonth);
+            return `${value} month${value !== 1 ? 's' : ''} ago`;
+        } else {
+            const value = Math.round(elapsed / msPerYear);
+            return `${value} year${value !== 1 ? 's' : ''} ago`;
+        }
     }
 }
 

package/lib/default/server.d.ts

@@ -1,11 +0,0 @@
-/********************************************************************************
- * Copyright (c) 2019-2020 TypeFox and others
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v. 2.0 which is available at
- * http://www.eclipse.org/legal/epl-2.0.
- *
- * SPDX-License-Identifier: EPL-2.0
- ********************************************************************************/
-export {};
-//# sourceMappingURL=server.d.ts.map

package/lib/default/server.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"server.d.ts","sourceRoot":"","sources":["../../src/default/server.ts"],"names":[],"mappings":"AAAA;;;;;;;;kFAQkF"}

package/lib/default/server.js

@@ -1,50 +0,0 @@
-"use strict";
-/********************************************************************************
- * Copyright (c) 2019-2020 TypeFox and others
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v. 2.0 which is available at
- * http://www.eclipse.org/legal/epl-2.0.
- *
- * SPDX-License-Identifier: EPL-2.0
- ********************************************************************************/
-Object.defineProperty(exports, "__esModule", { value: true });
-const express = require("express");
-const path = require("path");
-const express_rate_limit_1 = require("express-rate-limit");
-const app = express();
-const args = process.argv.slice(2);
-if (args.indexOf('-ratelimit') != -1) {
-    const proxiesIndex = args.indexOf('-ratelimit-proxies');
-    if (proxiesIndex != -1) {
-        app.set('trust proxy', Number(args[proxiesIndex + 1]));
-    }
-    let windowMs = 15 * 60 * 1000; // 15 minutes
-    const rateLimitWindowIndex = args.indexOf('-ratelimit-window-seconds');
-    if (rateLimitWindowIndex != -1) {
-        windowMs = Number(args[rateLimitWindowIndex + 1]) * 1000;
-    }
-    let limit = 100; // Limit each IP to 100 requests per windowMs
-    const rateLimitAmountIndex = args.indexOf('-ratelimit-limit');
-    if (rateLimitAmountIndex != -1) {
-        limit = Number(args[rateLimitAmountIndex + 1]);
-    }
-    // Apply rate limiter to all requests
-    const limiter = (0, express_rate_limit_1.rateLimit)({
-        windowMs,
-        limit,
-        standardHeaders: 'draft-7',
-        legacyHeaders: false
-    });
-    app.use(limiter);
-}
-// Serve static resources
-const staticPath = path.join(__dirname, '..', '..', 'static');
-app.use(express.static(staticPath));
-// Enable react-router by forwarding the main page to all paths that don't match a resource
-app.get('*', (req, res) => {
-    res.sendFile(path.join(staticPath, 'index.html'));
-});
-const port = 3000;
-app.listen(port, () => console.log(`Web UI server running on port ${port}...`));
-//# sourceMappingURL=server.js.map

package/lib/default/server.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"server.js","sourceRoot":"","sources":["../../src/default/server.ts"],"names":[],"mappings":";AAAA;;;;;;;;kFAQkF;;AAElF,mCAAmC;AACnC,6BAA6B;AAC7B,2DAA+C;AAE/C,MAAM,GAAG,GAAG,OAAO,EAAE,CAAC;AAEtB,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;AACnC,IAAI,IAAI,CAAC,OAAO,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC,EAAE;IAClC,MAAM,YAAY,GAAG,IAAI,CAAC,OAAO,CAAC,oBAAoB,CAAC,CAAC;IACxD,IAAI,YAAY,IAAI,CAAC,CAAC,EAAE;QACpB,GAAG,CAAC,GAAG,CAAC,aAAa,EAAE,MAAM,CAAC,IAAI,CAAC,YAAY,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;KAC1D;IAED,IAAI,QAAQ,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC,CAAC,aAAa;IAC5C,MAAM,oBAAoB,GAAG,IAAI,CAAC,OAAO,CAAC,2BAA2B,CAAC,CAAC;IACvE,IAAI,oBAAoB,IAAI,CAAC,CAAC,EAAE;QAC5B,QAAQ,GAAG,MAAM,CAAC,IAAI,CAAC,oBAAoB,GAAG,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC;KAC5D;IAED,IAAI,KAAK,GAAG,GAAG,CAAC,CAAC,6CAA6C;IAC9D,MAAM,oBAAoB,GAAG,IAAI,CAAC,OAAO,CAAC,kBAAkB,CAAC,CAAC;IAC9D,IAAI,oBAAoB,IAAI,CAAC,CAAC,EAAE;QAC5B,KAAK,GAAG,MAAM,CAAC,IAAI,CAAC,oBAAoB,GAAG,CAAC,CAAC,CAAC,CAAC;KAClD;IAED,qCAAqC;IACrC,MAAM,OAAO,GAAG,IAAA,8BAAS,EAAC;QACtB,QAAQ;QACR,KAAK;QACL,eAAe,EAAE,SAAS;QAC1B,aAAa,EAAE,KAAK;KACvB,CAAC,CAAC;IACH,GAAG,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;CACpB;AAED,yBAAyB;AACzB,MAAM,UAAU,GAAG,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,IAAI,EAAE,IAAI,EAAE,QAAQ,CAAC,CAAC;AAC9D,GAAG,CAAC,GAAG,CAAC,OAAO,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC,CAAC;AAEpC,2FAA2F;AAC3F,GAAG,CAAC,GAAG,CAAC,GAAG,EAAE,CAAC,GAAG,EAAE,GAAG,EAAE,EAAE;IACtB,GAAG,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,YAAY,CAAC,CAAC,CAAC;AACtD,CAAC,CAAC,CAAC;AAEH,MAAM,IAAI,GAAG,IAAI,CAAC;AAClB,GAAG,CAAC,MAAM,CAAC,IAAI,EAAE,GAAG,EAAE,CAAC,OAAO,CAAC,GAAG,CAAC,iCAAiC,IAAI,KAAK,CAAC,CAAC,CAAC"}