From 8b5178bae549b80340c8c783d57aa472eeb19f04 Mon Sep 17 00:00:00 2001 From: Andrei Mihu Date: Tue, 28 Mar 2017 20:10:08 +0100 Subject: [PATCH] Allow longer device IDs in link ops --- CHANGELOG.md | 1 + server/pipeline_link_unlink.go | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index db48e6752..7921f263f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,6 +12,7 @@ The format is based on [keep a changelog](http://keepachangelog.com/) and this p - Allow group batch fetch by both ID and name. - Increase heartbeat server time precision. - Rework the embedded dashboard. +- Allow up to 64 characters for device ID linking. ### Fixed - Fix Facebook unlink operation. diff --git a/server/pipeline_link_unlink.go b/server/pipeline_link_unlink.go index 7058e26d6..3c6f6993e 100644 --- a/server/pipeline_link_unlink.go +++ b/server/pipeline_link_unlink.go @@ -54,8 +54,8 @@ func (p *pipeline) linkDevice(logger zap.Logger, session *session, envelope *Env } else if invalidCharsRegex.MatchString(deviceID) { session.Send(ErrorMessageBadInput(envelope.CollationId, "Invalid device ID, no spaces or control characters allowed")) return - } else if len(deviceID) < 10 || len(deviceID) > 36 { - session.Send(ErrorMessageBadInput(envelope.CollationId, "Invalid device ID, must be 10-36 bytes")) + } else if len(deviceID) < 10 || len(deviceID) > 64 { + session.Send(ErrorMessageBadInput(envelope.CollationId, "Invalid device ID, must be 10-64 bytes")) return } -- GitLab