Skip to content

DEMRUM-5194: Fix vulnerabilities #147

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

Closed
tonzhan2 wants to merge 1 commit into from
Closed

DEMRUM-5194: Fix vulnerabilities #147

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
5 changes: 3 additions & 2 deletions src/commands/android.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,8 @@ import {
import {
BASE_URL_PREFIX,
API_VERSION_STRING,
ANDROID_CONSTANTS
ANDROID_CONSTANTS,
DEFAULT_DOMAIN
} from '../utils/constants';
import { UserFriendlyError } from '../utils/userFriendlyErrors';
import { createLogger, LogLevel } from '../utils/logger';
Expand All @@ -42,7 +43,7 @@ import { attachApiInterceptor } from '../utils/apiInterceptor';
export const androidCommand = new Command('android');

const generateURL = (type: 'upload' | 'list', realm: string, appId: string, versionCode?: string, splunkBuildId?: string): string => {
const baseUrl = `${BASE_URL_PREFIX}.${realm}.signalfx.com/${API_VERSION_STRING}/${ANDROID_CONSTANTS.PATH_FOR_UPLOAD}`;
const baseUrl = `${BASE_URL_PREFIX}.${realm}.${DEFAULT_DOMAIN}/${API_VERSION_STRING}/${ANDROID_CONSTANTS.PATH_FOR_UPLOAD}`;

if (type === 'upload') {
if (!versionCode) throw new Error('Version code is required for uploading.');
Expand Down
4 changes: 2 additions & 2 deletions src/dsyms/iOSdSYMUtils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

import { tmpdir } from 'os';
import { execSync } from 'child_process';
import { BASE_URL_PREFIX, API_VERSION_STRING } from '../utils/constants';
import { BASE_URL_PREFIX, API_VERSION_STRING, DEFAULT_DOMAIN } from '../utils/constants';
import { Logger } from '../utils/logger';
import { join, resolve, basename, dirname } from 'path';
import { copyFileSync, mkdtempSync, readdirSync, rmSync, statSync } from 'fs';
Expand All @@ -28,7 +28,7 @@ import { UserFriendlyError, throwAsUserFriendlyErrnoException } from '../utils/u
export const generateUrl = ({
apiPath,
realm,
domain = 'signalfx.com',
domain = DEFAULT_DOMAIN,
}: {
apiPath: string;
realm: string;
Expand Down
5 changes: 3 additions & 2 deletions src/sourcemaps/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,8 @@ import {
import {
BASE_URL_PREFIX,
API_VERSION_STRING,
SOURCEMAPS_CONSTANTS
SOURCEMAPS_CONSTANTS,
DEFAULT_DOMAIN
} from '../utils/constants';
import { throwAsUserFriendlyErrnoException } from '../utils/userFriendlyErrors';
import { discoverJsMapFilePath } from './discoverJsMapFilePath';
Expand Down Expand Up @@ -243,7 +244,7 @@ export async function runSourcemapUpload(options: SourceMapUploadOptions, ctx: S
}

function getSourceMapUploadUrl(realm: string, idPathParam: string): string {
const API_BASE_URL = `${BASE_URL_PREFIX}.${realm}.signalfx.com`;
const API_BASE_URL = `${BASE_URL_PREFIX}.${realm}.${DEFAULT_DOMAIN}`;
const PATH_FOR_SOURCEMAPS = SOURCEMAPS_CONSTANTS.PATH_FOR_UPLOAD;
return `${API_BASE_URL}/${API_VERSION_STRING}/${PATH_FOR_SOURCEMAPS}/id/${idPathParam}`;
}
Expand Down
4 changes: 4 additions & 0 deletions src/utils/constants.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,10 @@ export const API_VERSION_STRING = 'v2';
export const BASE_URL_PREFIX = 'https://api';
export const TOKEN_HEADER = 'X-SF-Token';

// Domain Constants
export const DEFAULT_DOMAIN = 'observability.splunkcloud.com';
export const LEGACY_DOMAIN = 'signalfx.com';

// Android-Specific Constants
export const ANDROID_CONSTANTS = {
PATH_FOR_UPLOAD: 'rum-mfm/proguard',
Expand Down
Loading