Skip to content

fix: simple prevention for creating duplicate sites with same baseURLs #1284

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

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: simple prevention for creating duplicate sites with same baseURLs #1284

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
8 changes: 8 additions & 0 deletions src/controllers/sites.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,12 @@ function SitesController(ctx, log, env) {
if (!accessControlUtil.hasAdminAccess()) {
return forbidden('Only admins can create new sites');
}
const exists = await Site.findByBaseURL(context?.data?.baseURL);
if (exists) {
return createResponse({
message: `Site with baseURL ${context?.data?.baseURL} exists`,
}, 409);
}
const site = await Site.create({
organizationId: env.DEFAULT_ORGANIZATION_ID,
...context.data,
Expand Down Expand Up @@ -589,6 +595,8 @@ function SitesController(ctx, log, env) {

const projectedTrafficValue = pageViewsChange * cpc;

log.info(`Got RUM metrics for site ${siteId} current: ${current.length}`);

return ok({
pageViewsChange,
ctrChange,
Expand Down
10 changes: 10 additions & 0 deletions test/controllers/sites.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -255,6 +255,7 @@ describe('Sites Controller', () => {
});

it('creates a site', async () => {
mockDataAccess.Site.findByBaseURL.resolves(null);
const response = await sitesController.createSite({ data: { baseURL: 'https://site1.com' } });

expect(mockDataAccess.Site.create).to.have.been.calledOnce;
Expand All @@ -265,6 +266,15 @@ describe('Sites Controller', () => {
expect(site).to.have.property('baseURL', 'https://site1.com');
});

it('creates site returns 409 if a site with baseURL exists', async () => {
const response = await sitesController.createSite({ data: { baseURL: 'https://site1.com' } });

expect(mockDataAccess.Site.create).to.have.not.been.called;
expect(response.status).to.equal(409);
const respJson = await response.json();
expect(respJson).to.have.property('message', 'Site with baseURL https://site1.com exists');
});

it('creates a site for a non-admin user', async () => {
context.attributes.authInfo.withProfile({ is_admin: false });
const response = await sitesController.createSite({ data: { baseURL: 'https://site1.com' } });
Expand Down