Page MenuHomePhabricator
Differential D3861

[keyserver] Bump `geoip-lite` to `1.4.5`
ClosedPublic
Actions

Authored by atul on Apr 27 2022, 8:32 AM.
Tags
None
Referenced Files
F5086180: D3861.diff
Sat, Mar 29, 6:54 PM
Unknown Object (File)
Thu, Mar 27, 6:06 AM
Unknown Object (File)
Wed, Mar 26, 5:17 PM
Unknown Object (File)
Sat, Mar 15, 1:54 AM
Unknown Object (File)
Sun, Mar 9, 10:03 PM
Unknown Object (File)
Sun, Mar 9, 10:03 PM
Unknown Object (File)
Sun, Mar 9, 10:03 PM
Unknown Object (File)
Sun, Mar 9, 10:03 PM
View All Files
Subscribers
• abosh
• adrian
• karol

Details

Reviewers
• jacek
tomek
ashoat
Commits
rCOMM4826e95db224: [keyserver] Bump `geoip-lite` to `1.4.5`
Summary

Downstream dependencies have issues surfaced by yarn audit

The repo doesn't have release notes, but skimmed through commits since 1.4.0 and there don't seem to be any breaking changes.

Depends on D3859

Test Plan

CI

Diff Detail

Repository
rCOMM Comm
Lint
Lint Not Applicable
Unit
Tests Not Applicable

Event Timeline

atul created this revision.Apr 27 2022, 8:32 AM
Herald added subscribers: • abosh, • karol, • adrian. · View Herald TranscriptApr 27 2022, 8:32 AM
atul added a comment.Apr 27 2022, 8:33 AM

(As of this diff, we've gone from 73 to 50 vulnerabilities according to yarn audit)

Harbormaster returned this revision to the author for changes because remote builds failed.Apr 27 2022, 8:35 AM
Harbormaster failed remote builds in B8609: Diff 11993!
atul edited the summary of this revision. (Show Details)Apr 27 2022, 8:45 AM
atul added a parent revision: D3860: [yarn] Bump transitive dependencies of `react-native-vector-icons`.
atul removed a parent revision: D3859: [yarn] Bump `clang-format` to `1.7.0`.
atul updated this revision to Diff 11994.Apr 27 2022, 9:13 AM

rebase

Harbormaster completed remote builds in B8610: Diff 11994.Apr 27 2022, 9:18 AM
atul requested review of this revision.Apr 27 2022, 9:18 AM
atul edited the summary of this revision. (Show Details)Apr 27 2022, 10:15 AM
atul added a parent revision: D3859: [yarn] Bump `clang-format` to `1.7.0`.
atul removed a parent revision: D3860: [yarn] Bump transitive dependencies of `react-native-vector-icons`.
atul added a child revision: D3863: [native] Bump `@react-navigation/native` to `5.9.8`.Apr 27 2022, 1:54 PM
ashoat accepted this revision.Apr 27 2022, 2:40 PM

Can you also test wherever we use geoip-lite to make sure it still works as expected? You can do this with cd keyserver && yarn update-geoip, but you'll need to create a keyserver/secrets/geoip_license.json file first.

comm@server:/var/www/comm$ cat keyserver/secrets/geoip_license.json
{
  "key": "SECRET_KEY_HERE_GET_THIS_FROM_ONE_PASSWORD"
}
This revision is now accepted and ready to land.Apr 27 2022, 2:40 PM
atul added a comment.Apr 28 2022, 12:35 PM
In D3861#107715, @ashoat wrote:

Can you also test wherever we use geoip-lite to make sure it still works as expected? You can do this with cd keyserver && yarn update-geoip, but you'll need to create a keyserver/secrets/geoip_license.json file first.

comm@server:/var/www/comm$ cat keyserver/secrets/geoip_license.json
{
  "key": "SECRET_KEY_HERE_GET_THIS_FROM_ONE_PASSWORD"
}

Yeah I'll give that a go. Thanks for the clear instructions, I don't have any context on geoip-lite.

Don't have access to 1Password at the moment (don't have work machine), but will test and land once I'm back.

atul added a comment.EditedMay 5 2022, 3:53 AM
In D3861#107715, @ashoat wrote:

Can you also test wherever we use geoip-lite to make sure it still works as expected? You can do this with cd keyserver && yarn update-geoip, but you'll need to create a keyserver/secrets/geoip_license.json file first.

comm@server:/var/www/comm$ cat keyserver/secrets/geoip_license.json
{
  "key": "SECRET_KEY_HERE_GET_THIS_FROM_ONE_PASSWORD"
}

Getting the following, it's not exiting and there's no indication it succeeded:

0f7a.png (572×1 px, 155 KB)

edit: added some logging in update-geo-db.js and node_modules/geo-ip/scripts/updatedb.js to try to diagnose... but by time I got back to terminal it looks like it completed. took like 120 seconds which was longer than I'd expect w/o context

atul updated this revision to Diff 12268.May 5 2022, 4:29 AM

rebase before landing (after testing)

atul updated this revision to Diff 12269.May 5 2022, 4:31 AM

dedupe

Harbormaster completed remote builds in B8803: Diff 12268.May 5 2022, 4:34 AM
Harbormaster completed remote builds in B8804: Diff 12269.May 5 2022, 4:41 AM
Closed by commit rCOMM4826e95db224: [keyserver] Bump `geoip-lite` to `1.4.5` (authored by atul). · Explain WhyMay 5 2022, 4:45 AM
This revision was automatically updated to reflect the committed changes.
atul added a commit: rCOMM4826e95db224: [keyserver] Bump `geoip-lite` to `1.4.5`.

Revision Contents
Changeset List

PathSize
keyserver/
2 lines
76 lines

Diff 12271

View Options

keyserver/package.json

Show All 22 Linesimport {
type ServerThreadJoinRequest, type ServerThreadJoinRequest,
type ThreadJoinResult, type ThreadJoinResult,
type ThreadFetchMediaResult, type ThreadFetchMediaResult,
type ThreadFetchMediaRequest, type ThreadFetchMediaRequest,
type ToggleMessagePinRequest, type ToggleMessagePinRequest,
type ToggleMessagePinResult, type ToggleMessagePinResult,
type RoleModificationRequest, type RoleModificationRequest,
type RoleModificationResult, type RoleModificationResult,
type RoleDeletionRequest,
type RoleDeletionResult,
rawThreadInfoValidator, rawThreadInfoValidator,
} from 'lib/types/thread-types.js'; } from 'lib/types/thread-types.js';
import { serverUpdateInfoValidator } from 'lib/types/update-types.js'; import { serverUpdateInfoValidator } from 'lib/types/update-types.js';
import { userInfosValidator } from 'lib/types/user-types.js'; import { userInfosValidator } from 'lib/types/user-types.js';
import { updateUserAvatarRequestValidator } from 'lib/utils/avatar-utils.js'; import { updateUserAvatarRequestValidator } from 'lib/utils/avatar-utils.js';
import { values } from 'lib/utils/objects.js'; import { values } from 'lib/utils/objects.js';
import { import {
tShape, tShape,
tNumEnum, tNumEnum,
tColor, tColor,
tPassword, tPassword,
tID, tID,
} from 'lib/utils/validation-utils.js'; } from 'lib/utils/validation-utils.js';
import { import {
entryQueryInputValidator, entryQueryInputValidator,
verifyCalendarQueryThreadIDs, verifyCalendarQueryThreadIDs,
} from './entry-responders.js'; } from './entry-responders.js';
import { modifyRole } from '../creators/role-creator.js'; import { modifyRole } from '../creators/role-creator.js';
import { createThread } from '../creators/thread-creator.js'; import { createThread } from '../creators/thread-creator.js';
import { deleteRole } from '../deleters/role-deleters.js';
import { deleteThread } from '../deleters/thread-deleters.js'; import { deleteThread } from '../deleters/thread-deleters.js';
import { fetchMediaForThread } from '../fetchers/upload-fetchers.js'; import { fetchMediaForThread } from '../fetchers/upload-fetchers.js';
import type { Viewer } from '../session/viewer.js'; import type { Viewer } from '../session/viewer.js';
import { import {
updateRole, updateRole,
removeMembers, removeMembers,
leaveThread, leaveThread,
updateThread, updateThread,
▲ Show 20 Lines • Show All 320 Lines • ▼ Show 20 Lines): Promise<RoleModificationResult> {
const response = await modifyRole(viewer, request); const response = await modifyRole(viewer, request);
return validateOutput( return validateOutput(
viewer.platformDetails, viewer.platformDetails,
roleModificationResultValidator, roleModificationResultValidator,
response, response,
); );
} }
const roleDeletionRequestInputValidator = tShape<RoleDeletionRequest>({
community: tID,
roleID: tID,
});
export const roleDeletionResultValidator: TInterface<RoleDeletionResult> =
tShape<RoleDeletionResult>({
threadInfo: t.maybe(rawThreadInfoValidator),
updatesResult: tShape({
newUpdates: t.list(serverUpdateInfoValidator),
}),
});
async function roleDeletionResponder(
viewer: Viewer,
input: mixed,
): Promise<RoleDeletionResult> {
const request = await validateInput(
viewer,
roleDeletionRequestInputValidator,
input,
);
const response = await deleteRole(viewer, request);
return validateOutput(
viewer.platformDetails,
roleDeletionResultValidator,
response,
);
}
export { export {
threadDeletionResponder, threadDeletionResponder,
roleUpdateResponder, roleUpdateResponder,
memberRemovalResponder, memberRemovalResponder,
threadLeaveResponder, threadLeaveResponder,
threadUpdateResponder, threadUpdateResponder,
threadCreationResponder, threadCreationResponder,
threadJoinResponder, threadJoinResponder,
threadFetchMediaResponder, threadFetchMediaResponder,
newThreadRequestInputValidator, newThreadRequestInputValidator,
toggleMessagePinResponder, toggleMessagePinResponder,
roleModificationResponder, roleModificationResponder,
roleDeletionResponder,
}; };
View Options

yarn.lock

Show All 22 Linesimport {
type ServerThreadJoinRequest, type ServerThreadJoinRequest,
type ThreadJoinResult, type ThreadJoinResult,
type ThreadFetchMediaResult, type ThreadFetchMediaResult,
type ThreadFetchMediaRequest, type ThreadFetchMediaRequest,
type ToggleMessagePinRequest, type ToggleMessagePinRequest,
type ToggleMessagePinResult, type ToggleMessagePinResult,
type RoleModificationRequest, type RoleModificationRequest,
type RoleModificationResult, type RoleModificationResult,
type RoleDeletionRequest,
type RoleDeletionResult,
rawThreadInfoValidator, rawThreadInfoValidator,
} from 'lib/types/thread-types.js'; } from 'lib/types/thread-types.js';
import { serverUpdateInfoValidator } from 'lib/types/update-types.js'; import { serverUpdateInfoValidator } from 'lib/types/update-types.js';
import { userInfosValidator } from 'lib/types/user-types.js'; import { userInfosValidator } from 'lib/types/user-types.js';
import { updateUserAvatarRequestValidator } from 'lib/utils/avatar-utils.js'; import { updateUserAvatarRequestValidator } from 'lib/utils/avatar-utils.js';
import { values } from 'lib/utils/objects.js'; import { values } from 'lib/utils/objects.js';
import { import {
tShape, tShape,
tNumEnum, tNumEnum,
tColor, tColor,
tPassword, tPassword,
tID, tID,
} from 'lib/utils/validation-utils.js'; } from 'lib/utils/validation-utils.js';
import { import {
entryQueryInputValidator, entryQueryInputValidator,
verifyCalendarQueryThreadIDs, verifyCalendarQueryThreadIDs,
} from './entry-responders.js'; } from './entry-responders.js';
import { modifyRole } from '../creators/role-creator.js'; import { modifyRole } from '../creators/role-creator.js';
import { createThread } from '../creators/thread-creator.js'; import { createThread } from '../creators/thread-creator.js';
import { deleteRole } from '../deleters/role-deleters.js';
import { deleteThread } from '../deleters/thread-deleters.js'; import { deleteThread } from '../deleters/thread-deleters.js';
import { fetchMediaForThread } from '../fetchers/upload-fetchers.js'; import { fetchMediaForThread } from '../fetchers/upload-fetchers.js';
import type { Viewer } from '../session/viewer.js'; import type { Viewer } from '../session/viewer.js';
import { import {
updateRole, updateRole,
removeMembers, removeMembers,
leaveThread, leaveThread,
updateThread, updateThread,
▲ Show 20 Lines • Show All 320 Lines • ▼ Show 20 Lines): Promise<RoleModificationResult> {
const response = await modifyRole(viewer, request); const response = await modifyRole(viewer, request);
return validateOutput( return validateOutput(
viewer.platformDetails, viewer.platformDetails,
roleModificationResultValidator, roleModificationResultValidator,
response, response,
); );
} }
const roleDeletionRequestInputValidator = tShape<RoleDeletionRequest>({
community: tID,
roleID: tID,
});
export const roleDeletionResultValidator: TInterface<RoleDeletionResult> =
tShape<RoleDeletionResult>({
threadInfo: t.maybe(rawThreadInfoValidator),
updatesResult: tShape({
newUpdates: t.list(serverUpdateInfoValidator),
}),
});
async function roleDeletionResponder(
viewer: Viewer,
input: mixed,
): Promise<RoleDeletionResult> {
const request = await validateInput(
viewer,
roleDeletionRequestInputValidator,
input,
);
const response = await deleteRole(viewer, request);
return validateOutput(
viewer.platformDetails,
roleDeletionResultValidator,
response,
);
}
export { export {
threadDeletionResponder, threadDeletionResponder,
roleUpdateResponder, roleUpdateResponder,
memberRemovalResponder, memberRemovalResponder,
threadLeaveResponder, threadLeaveResponder,
threadUpdateResponder, threadUpdateResponder,
threadCreationResponder, threadCreationResponder,
threadJoinResponder, threadJoinResponder,
threadFetchMediaResponder, threadFetchMediaResponder,
newThreadRequestInputValidator, newThreadRequestInputValidator,
toggleMessagePinResponder, toggleMessagePinResponder,
roleModificationResponder, roleModificationResponder,
roleDeletionResponder,
}; };