Sync-in · Sovereign platform for file storage, sharing, synchronization, and collaboration.
TypeScript cloud-alternativecollaborationcollaborative-editingdropboxfile-serverfile-sharingfile-storagefile-syncfull-text-searchhomelabnextcloudon-premiseopen-sourceprivacy-firstprivate-cloudrealtimesecureself-hostedstorage-serverwebdav
fix(backend:links): increment nbAccess even when no limit is set
johavend6d2e7425c16
diff --git a/backend/src/applications/links/services/links-manager.service.spec.ts b/backend/src/applications/links/services/links-manager.service.spec.tsindex ad877d7a..538312ac 100644--- a/backend/src/applications/links/services/links-manager.service.spec.ts+++ b/backend/src/applications/links/services/links-manager.service.spec.ts@@ -20,6 +20,7 @@ import { SharesManager } from '../../shares/services/shares-manager.service'import { SharesQueries } from '../../shares/services/shares-queries.service'import { SpacesManager } from '../../spaces/services/spaces-manager.service'import { SpacesQueries } from '../../spaces/services/spaces-queries.service'+import { UserModel } from '../../users/models/user.model'import { AdminUsersManager } from '../../users/services/admin-users-manager.service'import { AdminUsersQueries } from '../../users/services/admin-users-queries.service'import { UsersManager } from '../../users/services/users-manager.service'@@ -29,8 +30,47 @@ import { LinksQueries } from './links-queries.service'describe(LinksManager.name, () => {let service: LinksManager+ let linksQueriesMock: jest.Mocked<LinksQueries>+ let usersManagerMock: jest.Mocked<UsersManager>+ let filesManagerMock: jest.Mocked<FilesManager>+ let spacesManagerMock: jest.Mocked<SpacesManager>+ let authManagerMock: jest.Mocked<AuthManager>++ const identity: any = { id: 42, login: 'visitor' }+ const baseLink: any = {+ uuid: 'uuid-123',+ user: { id: 7, login: 'john', isActive: true },+ requireAuth: false,+ limitAccess: 0,+ nbAccess: 0,+ expiresAt: null+ }beforeAll(async () => {+ linksQueriesMock = {+ linkFromUUID: jest.fn(),+ spaceLink: jest.fn(),+ incrementLinkNbAccess: jest.fn().mockResolvedValue(undefined)+ } as any++ usersManagerMock = {+ getAvatarBase64: jest.fn(),+ compareUserPassword: jest.fn(),+ updateAccesses: jest.fn()+ } as any++ filesManagerMock = {+ sendFileFromSpace: jest.fn()+ } as any++ spacesManagerMock = {+ spaceEnv: jest.fn()+ } as any++ authManagerMock = {+ setCookies: jest.fn()+ } as any+const module: TestingModule = await Test.createTestingModule({providers: [{@@ -48,28 +88,253 @@ describe(LinksManager.name, () => {},{ provide: HttpService, useValue: {} },{ provide: FilesLockManager, useValue: {} },- ConfigService,- JwtService,- AuthManager,- UsersManager,- UsersQueries,- AdminUsersManager,- AdminUsersQueries,- FilesQueries,- FilesManager,- SpacesQueries,- SpacesManager,- SharesQueries,- SharesManager,- LinksQueries,+ { provide: ConfigService, useValue: {} },+ { provide: JwtService, useValue: {} },+ { provide: AuthManager, useValue: authManagerMock },+ { provide: UsersManager, useValue: usersManagerMock },+ { provide: UsersQueries, useValue: {} },+ { provide: AdminUsersManager, useValue: {} },+ { provide: AdminUsersQueries, useValue: {} },+ { provide: FilesQueries, useValue: {} },+ { provide: FilesManager, useValue: filesManagerMock },+ { provide: SpacesQueries, useValue: {} },+ { provide: SpacesManager, useValue: spacesManagerMock },+ { provide: SharesQueries, useValue: {} },+ { provide: SharesManager, useValue: {} },+ { provide: LinksQueries, useValue: linksQueriesMock },LinksManager]}).compile()+ module.useLogger(['fatal'])service = module.get<LinksManager>(LinksManager)})+ beforeEach(() => {+ jest.clearAllMocks()+ })+it('should be defined', () => {expect(service).toBeDefined()})++ describe('linkValidation', () => {+ it('returns ok with sanitized owner and avatar when link is valid', async () => {+ const link = { ...baseLink }+ linksQueriesMock.linkFromUUID.mockResolvedValueOnce(link)+ const spaceLink = {+ owner: { login: 'jane' },+ share: { isDir: true, alias: 's-alias', name: 'Docs' },+ space: null+ } as any+ linksQueriesMock.spaceLink.mockResolvedValueOnce(spaceLink)+ usersManagerMock.getAvatarBase64.mockResolvedValueOnce('base64-avatar')++ const res = await service.linkValidation(identity, link.uuid)++ expect(res.ok).toBe(true)+ expect(res.error).toBeNull()+ expect(res.link).toBe(spaceLink)+ expect(spaceLink.owner.avatar).toBe('base64-avatar')+ expect((spaceLink.owner as any).login).toBeUndefined()+ expect(linksQueriesMock.spaceLink).toHaveBeenCalledWith(link.uuid)++ // extra coverage: directly assert private checkLink with default ignoreAuth=false+ const directCheck = (service as any).checkLink(identity, link)+ expect(directCheck).toBe(true)+ })++ it('returns error and null link when uuid is not found', async () => {+ linksQueriesMock.linkFromUUID.mockResolvedValueOnce(null)++ const res = await service.linkValidation(identity, 'missing-uuid')++ expect(res.ok).toBe(false)+ expect(res.error).toBeDefined()+ expect(res.link).toBeNull()+ })++ it('returns unauthorized when auth is required and identity differs', async () => {+ const link = { ...baseLink, requireAuth: true }+ linksQueriesMock.linkFromUUID.mockResolvedValueOnce(link)++ const res = await service.linkValidation(identity, link.uuid)++ expect(res.ok).toBe(false)+ expect(String(res.error).toLowerCase()).toContain('unauthorized')+ expect(res.link).toBeNull()++ // extra coverage: directly assert private checkLink with default ignoreAuth=false+ const directCheck = (service as any).checkLink(identity, link)+ expect(String(directCheck).toLowerCase()).toContain('unauthorized')+ })++ it('returns exceeded when nbAccess >= limitAccess', async () => {+ const link = { ...baseLink, limitAccess: 5, nbAccess: 5 }+ linksQueriesMock.linkFromUUID.mockResolvedValueOnce(link)++ const res = await service.linkValidation(identity, link.uuid)++ expect(res.ok).toBe(false)+ expect(String(res.error).toLowerCase()).toContain('exceeded')+ })+ })++ describe('linkAccess', () => {+ const req: any = { ip: '127.0.0.1' }+ const res: any = {}++ it('streams a file when link targets a single file', async () => {+ const link = { ...baseLink, limitAccess: 10 }+ linksQueriesMock.linkFromUUID.mockResolvedValueOnce(link)+ const spaceLink = {+ space: null,+ share: { isDir: false, name: 'file.txt', alias: 'share-alias' }+ } as any+ linksQueriesMock.spaceLink.mockResolvedValueOnce(spaceLink)++ spacesManagerMock.spaceEnv.mockResolvedValueOnce({} as any)+ const streamable: any = { some: 'stream' }+ filesManagerMock.sendFileFromSpace.mockReturnValueOnce({+ checks: jest.fn().mockResolvedValueOnce(undefined),+ stream: jest.fn().mockResolvedValueOnce(streamable)+ } as any)++ // cover: incrementLinkNbAccess.catch(...) should log an error when the query rejects+ const logErrorSpy = jest.spyOn((service as any).logger, 'error').mockImplementation(() => undefined as any)+ linksQueriesMock.incrementLinkNbAccess.mockRejectedValueOnce(new Error('increment boom'))++ const result = await service.linkAccess(identity, link.uuid, req, res)++ expect(result).toBe(streamable)+ expect(filesManagerMock.sendFileFromSpace).toHaveBeenCalled()+ expect(linksQueriesMock.incrementLinkNbAccess).toHaveBeenCalledWith(link.uuid)+ // Assert repository selection for a share file (space falsy)+ // should call spacesManager.spaceEnv with SHARES and share alias when link.space is falsy+ expect(spacesManagerMock.spaceEnv).toHaveBeenCalledWith(expect.anything(), ['shares', 'share-alias'])+ // should log error when increment fails+ expect(logErrorSpy).toHaveBeenCalled()+ })++ it('authenticates and returns cookies when link targets a directory and user is different', async () => {+ const link = { ...baseLink, requireAuth: false, user: { id: 7, login: 'john', isActive: true } }+ linksQueriesMock.linkFromUUID.mockResolvedValueOnce(link)+ const spaceLink = {+ space: { alias: 'files', name: 'My Space' },+ share: { isDir: true, name: 'ignored', alias: 'ignored' }+ } as any+ linksQueriesMock.spaceLink.mockResolvedValueOnce(spaceLink)++ const loginDto: any = { token: 'jwt' }+ authManagerMock.setCookies.mockResolvedValueOnce(loginDto)++ // cover: usersManager.updateAccesses.catch(...) should log an error when updateAccesses rejects+ const logErrorSpy = jest.spyOn((service as any).logger, 'error').mockImplementation(() => undefined as any)+ usersManagerMock.updateAccesses.mockRejectedValueOnce(new Error('updateAccesses boom'))++ const result = await service.linkAccess(identity, link.uuid, req, res)++ expect(result).toBe(loginDto)+ expect(usersManagerMock.updateAccesses).toHaveBeenCalledWith(expect.anything(), req.ip, true)+ expect(authManagerMock.setCookies).toHaveBeenCalled()+ // additionally cover the "space truthy" branch by calling the private helper directly+ // should call spacesManager.spaceEnv with FILES and space alias when link.space is truthy+ await (service as any).spaceEnvFromLink(new UserModel(link.user as any), spaceLink as any)+ expect(spacesManagerMock.spaceEnv).toHaveBeenCalledWith(expect.anything(), ['files', 'files'])+ // should log error when updateAccesses fails+ expect(logErrorSpy).toHaveBeenCalled()+ })++ it('throws BAD_REQUEST when link is invalid', async () => {+ const disabledLink = { ...baseLink, user: { id: 7, login: 'john', isActive: false } }+ linksQueriesMock.linkFromUUID.mockResolvedValueOnce(disabledLink)++ await expect(service.linkAccess(identity, disabledLink.uuid, req, res)).rejects.toMatchObject({+ status: 400+ })+ })++ it('returns undefined for already authenticated directory access (same user) and does not set cookies or increment', async () => {+ const sameUserIdentity = { id: baseLink.user.id, login: 'john' }+ const link = { ...baseLink, requireAuth: true }+ linksQueriesMock.linkFromUUID.mockResolvedValueOnce(link)+ const spaceLink = {+ space: { alias: 'files', name: 'Space' },+ share: { isDir: true, name: 'dir', alias: 'share' }+ } as any+ linksQueriesMock.spaceLink.mockResolvedValueOnce(spaceLink)++ const result = await service.linkAccess(sameUserIdentity as any, link.uuid, req, res)++ expect(result).toBeUndefined()+ expect(authManagerMock.setCookies).not.toHaveBeenCalled()+ expect(linksQueriesMock.incrementLinkNbAccess).not.toHaveBeenCalled()+ })++ it('throws INTERNAL_SERVER_ERROR when file checks fail during streaming', async () => {+ const link = { ...baseLink, limitAccess: 10 }+ linksQueriesMock.linkFromUUID.mockResolvedValueOnce(link)+ const spaceLink = {+ space: null,+ share: { isDir: false, name: 'bad.txt', alias: 'share' }+ } as any+ linksQueriesMock.spaceLink.mockResolvedValueOnce(spaceLink)++ spacesManagerMock.spaceEnv.mockResolvedValueOnce({} as any)+ filesManagerMock.sendFileFromSpace.mockReturnValueOnce({+ checks: jest.fn().mockRejectedValueOnce(new Error('disk error')),+ stream: jest.fn()+ } as any)++ await expect(service.linkAccess(identity, link.uuid, req, res)).rejects.toMatchObject({+ status: 500+ })+ expect(linksQueriesMock.incrementLinkNbAccess).toHaveBeenCalledWith(link.uuid)+ })+ })++ describe('linkAuthentication', () => {+ const req: any = { ip: '10.0.0.1' }+ const res: any = {}++ it('returns cookies when password is correct', async () => {+ const link = { ...baseLink, requireAuth: true }+ linksQueriesMock.linkFromUUID.mockResolvedValueOnce(link)+ usersManagerMock.compareUserPassword.mockResolvedValueOnce(true)+ // usersManagerMock.updateAccesses.mockResolvedValueOnce(undefined) // removed to ensure rejection is hit+ const loginDto: any = { token: 'abc' }+ authManagerMock.setCookies.mockResolvedValueOnce(loginDto)++ // cover: usersManager.updateAccesses.catch(...) should log an error when updateAccesses rejects (success flow)+ const logErrorSpy = jest.spyOn((service as any).logger, 'error').mockImplementation(() => undefined as any)+ usersManagerMock.updateAccesses.mockRejectedValueOnce(new Error('updateAccesses auth success boom'))++ const result = await service.linkAuthentication(identity, link.uuid, { password: 'secret' } as any, req, res)++ expect(result).toBe(loginDto)+ expect(usersManagerMock.compareUserPassword).toHaveBeenCalledWith(link.user.id, 'secret')+ expect(usersManagerMock.updateAccesses).toHaveBeenCalledWith(expect.anything(), req.ip, true)+ expect(authManagerMock.setCookies).toHaveBeenCalled()+ // should log error when updateAccesses fails in successful authentication+ expect(logErrorSpy).toHaveBeenCalled()+ })++ it('throws FORBIDDEN when password is incorrect', async () => {+ const link = { ...baseLink, requireAuth: true }+ linksQueriesMock.linkFromUUID.mockResolvedValueOnce(link)+ usersManagerMock.compareUserPassword.mockResolvedValueOnce(false)+ usersManagerMock.updateAccesses.mockResolvedValueOnce(undefined)++ await expect(service.linkAuthentication(identity, link.uuid, { password: 'bad' } as any, req, res)).rejects.toMatchObject({ status: 403 })+ })++ it('throws BAD_REQUEST when link is invalid (e.g., expired)', async () => {+ const expired = { ...baseLink, expiresAt: new Date(Date.now() - 60_000) }+ linksQueriesMock.linkFromUUID.mockResolvedValueOnce(expired)++ await expect(service.linkAuthentication(identity, expired.uuid, { password: 'whatever' } as any, req, res)).rejects.toMatchObject({+ status: 400+ })+ })+ })})diff --git a/backend/src/applications/links/services/links-manager.service.ts b/backend/src/applications/links/services/links-manager.service.tsindex d901fae1..cf02beca 100644--- a/backend/src/applications/links/services/links-manager.service.ts+++ b/backend/src/applications/links/services/links-manager.service.ts@@ -59,7 +59,7 @@ export class LinksManager {if (!spaceLink.space && !spaceLink.share.isDir) {// download the file (authentication has been verified before)this.logger.log(`${this.linkAccess.name} - *${user.login}* (${user.id}) downloading ${spaceLink.share.name}`)- this.incrementLinkAccess(link)+ this.incrementLinkNbAccess(link)const spaceEnv: SpaceEnv = await this.spaceEnvFromLink(user, spaceLink)const sendFile: SendFile = this.filesManager.sendFileFromSpace(spaceEnv, true, spaceLink.share.name)try {@@ -72,7 +72,7 @@ export class LinksManager {} else if (link.user.id !== identity.id) {// authenticate user to allow access to the directorythis.logger.log(`${this.linkAccess.name} - *${user.login}* (${user.id}) is logged`)- this.incrementLinkAccess(link)+ this.incrementLinkNbAccess(link)this.usersManager.updateAccesses(user, req.ip, true).catch((e: Error) => this.logger.error(`${this.linkAccess.name} - ${e}`))return this.authManager.setCookies(user, res)}@@ -130,9 +130,7 @@ export class LinksManager {return true}- private incrementLinkAccess(link: LinkAsUser) {- if (link.limitAccess !== null) {- this.linksQueries.incrementLinkAccess(link.uuid).catch((e: Error) => this.logger.error(`${this.incrementLinkAccess.name} - ${e}`))- }+ private incrementLinkNbAccess(link: LinkAsUser) {+ this.linksQueries.incrementLinkNbAccess(link.uuid).catch((e: Error) => this.logger.error(`${this.incrementLinkNbAccess.name} - ${e}`))}}diff --git a/backend/src/applications/links/services/links-queries.service.ts b/backend/src/applications/links/services/links-queries.service.tsindex 8a31e005..a86ee833 100644--- a/backend/src/applications/links/services/links-queries.service.ts+++ b/backend/src/applications/links/services/links-queries.service.ts@@ -179,7 +179,7 @@ export class LinksQueries {return r}- async incrementLinkAccess(uuid: string) {+ async incrementLinkNbAccess(uuid: string) {await this.db.update(links).set({ nbAccess: sql`${links.nbAccess} + 1` } as Record<keyof Link, any>)