From 076558469e909ef7225e9999f0eb0a7b9ae32a7c Mon Sep 17 00:00:00 2001
From: porosnicuadrian <adrian.porosnicu@itsyscom.com>
Date: Tue, 27 Apr 2021 17:13:07 +0300
Subject: [PATCH] Fixed Path sanitization when migrating from user into
 AttributeProfile

---
 migrator/user.go         | 2 +-
 migrator/user_it_test.go | 2 +-
 migrator/user_test.go    | 8 ++++----
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/migrator/user.go b/migrator/user.go
index 93aed5eb3..0fca69bee 100644
--- a/migrator/user.go
+++ b/migrator/user.go
@@ -73,7 +73,7 @@ func userProfile2attributeProfile(user *v1UserProfile) (attr *engine.AttributePr
 			fieldName = utils.RequestType
 		}
 		if utils.IsSliceMember(usrFltr, fieldName) {
-			attr.FilterIDs = append(attr.FilterIDs, fmt.Sprintf("*string:~%s:%s", fieldName, substitute))
+			attr.FilterIDs = append(attr.FilterIDs, fmt.Sprintf("*string:~*req.%s:%s", fieldName, substitute))
 			continue
 		}
 		var path string
diff --git a/migrator/user_it_test.go b/migrator/user_it_test.go
index 50345de28..420de174f 100644
--- a/migrator/user_it_test.go
+++ b/migrator/user_it_test.go
@@ -194,7 +194,7 @@ func testUsrITMigrateAndMove(t *testing.T) {
 	}
 
 	expUsrIdx := map[string]utils.StringSet{
-		"*string:Account:1002": {
+		"*string:*req.Account:1002": {
 			"1001": struct{}{},
 		},
 	}
diff --git a/migrator/user_test.go b/migrator/user_test.go
index 358cf5f29..d09369feb 100644
--- a/migrator/user_test.go
+++ b/migrator/user_test.go
@@ -100,7 +100,7 @@ func TestUserProfile2attributeProfile(t *testing.T) {
 			Tenant:             defaultTenant,
 			ID:                 "1001",
 			Contexts:           []string{utils.MetaAny},
-			FilterIDs:          []string{"*string:~Account:1002"},
+			FilterIDs:          []string{"*string:~*req.Account:1002"},
 			ActivationInterval: nil,
 			Attributes: []*engine.Attribute{
 				{
@@ -122,7 +122,7 @@ func TestUserProfile2attributeProfile(t *testing.T) {
 			ID:       "1001",
 			Contexts: []string{utils.MetaAny},
 			FilterIDs: []string{
-				"*string:~Account:1002",
+				"*string:~*req.Account:1002",
 			},
 			ActivationInterval: nil,
 			Attributes: []*engine.Attribute{
@@ -144,7 +144,7 @@ func TestUserProfile2attributeProfile(t *testing.T) {
 			Tenant:             defaultTenant,
 			ID:                 "1001",
 			Contexts:           []string{utils.MetaAny},
-			FilterIDs:          []string{"*string:~Account:1002"},
+			FilterIDs:          []string{"*string:~*req.Account:1002"},
 			ActivationInterval: nil,
 			Attributes: []*engine.Attribute{
 				{
@@ -166,7 +166,7 @@ func TestUserProfile2attributeProfile(t *testing.T) {
 			ID:       "acstmusername",
 			Contexts: []string{utils.MetaAny},
 			FilterIDs: []string{
-				"*string:~Account:acnt63",
+				"*string:~*req.Account:acnt63",
 			},
 			ActivationInterval: nil,
 			Attributes: []*engine.Attribute{