| @@ -91,215 +91,215 @@ | ||
| 91 | 91 |  switch ($post_type) { | 
| 92 | 92 | //########################################################## | 
| 93 | 93 | //CASE for creating a DB backup | 
| 94 | -case 'perform_fix_pf_items-step1': | |
| 95 | - // Check KEY | |
| 96 | -    if (!hash_equals((string) $session->get('key'), (string) $post_key)) { | |
| 97 | - echo prepareExchangedData( | |
| 98 | - array( | |
| 99 | - 'error' => true, | |
| 100 | -                'message' => $lang->get('key_is_not_correct'), | |
| 101 | - ), | |
| 102 | - 'encode' | |
| 103 | - ); | |
| 104 | - break; | |
| 105 | - } | |
| 106 | - // Is admin? | |
| 107 | -    if ((int) $session->get('user-admin') !== 1) { | |
| 108 | - echo prepareExchangedData( | |
| 109 | - array( | |
| 110 | - 'error' => true, | |
| 111 | -                'message' => $lang->get('error_not_allowed_to'), | |
| 112 | - ), | |
| 113 | - 'encode' | |
| 114 | - ); | |
| 115 | - break; | |
| 116 | - } | |
| 94 | + case 'perform_fix_pf_items-step1': | |
| 95 | + // Check KEY | |
| 96 | +        if (!hash_equals((string) $session->get('key'), (string) $post_key)) { | |
| 97 | + echo prepareExchangedData( | |
| 98 | + array( | |
| 99 | + 'error' => true, | |
| 100 | +                    'message' => $lang->get('key_is_not_correct'), | |
| 101 | + ), | |
| 102 | + 'encode' | |
| 103 | + ); | |
| 104 | + break; | |
| 105 | + } | |
| 106 | + // Is admin? | |
| 107 | +        if ((int) $session->get('user-admin') !== 1) { | |
| 108 | + echo prepareExchangedData( | |
| 109 | + array( | |
| 110 | + 'error' => true, | |
| 111 | +                    'message' => $lang->get('error_not_allowed_to'), | |
| 112 | + ), | |
| 113 | + 'encode' | |
| 114 | + ); | |
| 115 | + break; | |
| 116 | + } | |
| 117 | 117 | |
| 118 | - // decrypt and retrieve data in JSON format | |
| 119 | - $dataReceived = prepareExchangedData( | |
| 120 | - $post_data, | |
| 121 | - 'decode' | |
| 122 | - ); | |
| 118 | + // decrypt and retrieve data in JSON format | |
| 119 | + $dataReceived = prepareExchangedData( | |
| 120 | + $post_data, | |
| 121 | + 'decode' | |
| 122 | + ); | |
| 123 | 123 | |
| 124 | - $userId = filter_var($dataReceived['userId'], FILTER_SANITIZE_NUMBER_INT); | |
| 124 | + $userId = filter_var($dataReceived['userId'], FILTER_SANITIZE_NUMBER_INT); | |
| 125 | 125 | |
| 126 | - // Get user info | |
| 127 | - $userInfo = DB::queryFirstRow( | |
| 128 | - 'SELECT private_key, public_key, psk, encrypted_psk | |
| 126 | + // Get user info | |
| 127 | + $userInfo = DB::queryFirstRow( | |
| 128 | + 'SELECT private_key, public_key, psk, encrypted_psk | |
| 129 | 129 | FROM teampass_users | 
| 130 | 130 | WHERE id = %i', | 
| 131 | - $userId | |
| 132 | - ); | |
| 131 | + $userId | |
| 132 | + ); | |
| 133 | 133 | |
| 134 | - // Get user's private folders | |
| 135 | - $userPFRoot = DB::queryFirstRow( | |
| 136 | - 'SELECT id | |
| 134 | + // Get user's private folders | |
| 135 | + $userPFRoot = DB::queryFirstRow( | |
| 136 | + 'SELECT id | |
| 137 | 137 | FROM teampass_nested_tree | 
| 138 | 138 | WHERE title = %i', | 
| 139 | - $userId | |
| 140 | - ); | |
| 141 | -    if (DB::count() === 0) { | |
| 142 | - echo prepareExchangedData( | |
| 143 | - array( | |
| 144 | - 'error' => true, | |
| 145 | - 'message' => 'User has no personal folders', | |
| 146 | - ), | |
| 147 | - 'encode' | |
| 148 | - ); | |
| 149 | - break; | |
| 150 | - } | |
| 151 | - $personalFolders = []; | |
| 152 | -    $tree = new NestedTree(prefixTable('nested_tree'), 'id', 'parent_id', 'title'); | |
| 153 | - $tree->rebuild(); | |
| 154 | - $folders = $tree->getDescendants($userPFRoot['id'], true); | |
| 155 | -    foreach ($folders as $folder) { | |
| 156 | - array_push($personalFolders, $folder->id); | |
| 157 | - } | |
| 158 | - | |
| 159 | - //Show done | |
| 160 | - echo prepareExchangedData( | |
| 161 | - array( | |
| 162 | - 'error' => false, | |
| 163 | - 'message' => 'Personal Folders found: ', | |
| 164 | - 'personalFolders' => json_encode($personalFolders), | |
| 165 | - ), | |
| 166 | - 'encode' | |
| 167 | - ); | |
| 168 | - break; | |
| 169 | - | |
| 170 | -case 'perform_fix_pf_items-step2': | |
| 171 | - // Check KEY | |
| 172 | -    if (!hash_equals((string) $session->get('key'), (string) $post_key)) { | |
| 173 | - echo prepareExchangedData( | |
| 174 | - array( | |
| 175 | - 'error' => true, | |
| 176 | -                'message' => $lang->get('key_is_not_correct'), | |
| 177 | - ), | |
| 178 | - 'encode' | |
| 139 | + $userId | |
| 179 | 140 | ); | 
| 180 | - break; | |
| 181 | - } | |
| 182 | - // Is admin? | |
| 183 | -    if ((int) $session->get('user-admin') !== 1) { | |
| 141 | +        if (DB::count() === 0) { | |
| 142 | + echo prepareExchangedData( | |
| 143 | + array( | |
| 144 | + 'error' => true, | |
| 145 | + 'message' => 'User has no personal folders', | |
| 146 | + ), | |
| 147 | + 'encode' | |
| 148 | + ); | |
| 149 | + break; | |
| 150 | + } | |
| 151 | + $personalFolders = []; | |
| 152 | +        $tree = new NestedTree(prefixTable('nested_tree'), 'id', 'parent_id', 'title'); | |
| 153 | + $tree->rebuild(); | |
| 154 | + $folders = $tree->getDescendants($userPFRoot['id'], true); | |
| 155 | +        foreach ($folders as $folder) { | |
| 156 | + array_push($personalFolders, $folder->id); | |
| 157 | + } | |
| 158 | + | |
| 159 | + //Show done | |
| 184 | 160 | echo prepareExchangedData( | 
| 185 | 161 | array( | 
| 186 | - 'error' => true, | |
| 187 | -                'message' => $lang->get('error_not_allowed_to'), | |
| 162 | + 'error' => false, | |
| 163 | + 'message' => 'Personal Folders found: ', | |
| 164 | + 'personalFolders' => json_encode($personalFolders), | |
| 188 | 165 | ), | 
| 189 | 166 | 'encode' | 
| 190 | 167 | ); | 
| 191 | 168 | break; | 
| 192 | - } | |
| 193 | 169 | |
| 194 | - // decrypt and retrieve data in JSON format | |
| 195 | - $dataReceived = prepareExchangedData( | |
| 196 | - $post_data, | |
| 197 | - 'decode' | |
| 198 | - ); | |
| 170 | + case 'perform_fix_pf_items-step2': | |
| 171 | + // Check KEY | |
| 172 | +        if (!hash_equals((string) $session->get('key'), (string) $post_key)) { | |
| 173 | + echo prepareExchangedData( | |
| 174 | + array( | |
| 175 | + 'error' => true, | |
| 176 | +                    'message' => $lang->get('key_is_not_correct'), | |
| 177 | + ), | |
| 178 | + 'encode' | |
| 179 | + ); | |
| 180 | + break; | |
| 181 | + } | |
| 182 | + // Is admin? | |
| 183 | +        if ((int) $session->get('user-admin') !== 1) { | |
| 184 | + echo prepareExchangedData( | |
| 185 | + array( | |
| 186 | + 'error' => true, | |
| 187 | +                    'message' => $lang->get('error_not_allowed_to'), | |
| 188 | + ), | |
| 189 | + 'encode' | |
| 190 | + ); | |
| 191 | + break; | |
| 192 | + } | |
| 199 | 193 | |
| 200 | - $userId = filter_var($dataReceived['userId'], FILTER_SANITIZE_NUMBER_INT); | |
| 201 | - $personalFolders = filter_var($dataReceived['personalFolders'], FILTER_SANITIZE_FULL_SPECIAL_CHARS); | |
| 194 | + // decrypt and retrieve data in JSON format | |
| 195 | + $dataReceived = prepareExchangedData( | |
| 196 | + $post_data, | |
| 197 | + 'decode' | |
| 198 | + ); | |
| 199 | + | |
| 200 | + $userId = filter_var($dataReceived['userId'], FILTER_SANITIZE_NUMBER_INT); | |
| 201 | + $personalFolders = filter_var($dataReceived['personalFolders'], FILTER_SANITIZE_FULL_SPECIAL_CHARS); | |
| 202 | 202 | |
| 203 | - // Delete all private items with sharekeys | |
| 204 | - $pfiSharekeys = DB::queryFirstColumn( | |
| 205 | - 'select s.increment_id | |
| 203 | + // Delete all private items with sharekeys | |
| 204 | + $pfiSharekeys = DB::queryFirstColumn( | |
| 205 | + 'select s.increment_id | |
| 206 | 206 | from teampass_sharekeys_items as s | 
| 207 | 207 | INNER JOIN teampass_items AS i ON (i.id = s.object_id) | 
| 208 | 208 | WHERE s.user_id = %i AND i.perso = 1 AND i.id_tree IN %ls', | 
| 209 | - $userId, | |
| 210 | - $personalFolders | |
| 211 | - ); | |
| 212 | - $pfiSharekeysCount = DB::count(); | |
| 213 | -    if ($pfiSharekeysCount > 0) { | |
| 214 | - DB::delete( | |
| 215 | - "teampass_sharekeys_items", | |
| 216 | - "increment_id IN %ls", | |
| 217 | - $pfiSharekeys | |
| 209 | + $userId, | |
| 210 | + $personalFolders | |
| 218 | 211 | ); | 
| 219 | - } | |
| 212 | + $pfiSharekeysCount = DB::count(); | |
| 213 | +        if ($pfiSharekeysCount > 0) { | |
| 214 | + DB::delete( | |
| 215 | + "teampass_sharekeys_items", | |
| 216 | + "increment_id IN %ls", | |
| 217 | + $pfiSharekeys | |
| 218 | + ); | |
| 219 | + } | |
| 220 | 220 | |
| 221 | 221 | |
| 222 | - //Show done | |
| 223 | - echo prepareExchangedData( | |
| 224 | - array( | |
| 225 | - 'error' => false, | |
| 226 | - 'message' => '<br>Number of Sharekeys for private items DELETED: ', | |
| 227 | - 'nbDeleted' => $pfiSharekeysCount, | |
| 228 | - 'personalFolders' => json_encode($personalFolders), | |
| 229 | - ), | |
| 230 | - 'encode' | |
| 231 | - ); | |
| 232 | - break; | |
| 233 | - | |
| 234 | -case 'perform_fix_pf_items-step3': | |
| 235 | - // Check KEY | |
| 236 | -    if (!hash_equals((string) $session->get('key'), (string) $post_key)) { | |
| 237 | - echo prepareExchangedData( | |
| 238 | - array( | |
| 239 | - 'error' => true, | |
| 240 | -                'message' => $lang->get('key_is_not_correct'), | |
| 241 | - ), | |
| 242 | - 'encode' | |
| 243 | - ); | |
| 244 | - break; | |
| 245 | - } | |
| 246 | - // Is admin? | |
| 247 | -    if ((int) $session->get('user-admin') !== 1) { | |
| 222 | + //Show done | |
| 248 | 223 | echo prepareExchangedData( | 
| 249 | 224 | array( | 
| 250 | - 'error' => true, | |
| 251 | -                'message' => $lang->get('error_not_allowed_to'), | |
| 225 | + 'error' => false, | |
| 226 | + 'message' => '<br>Number of Sharekeys for private items DELETED: ', | |
| 227 | + 'nbDeleted' => $pfiSharekeysCount, | |
| 228 | + 'personalFolders' => json_encode($personalFolders), | |
| 252 | 229 | ), | 
| 253 | 230 | 'encode' | 
| 254 | 231 | ); | 
| 255 | 232 | break; | 
| 256 | - } | |
| 257 | 233 | |
| 258 | - // decrypt and retrieve data in JSON format | |
| 259 | - $dataReceived = prepareExchangedData( | |
| 260 | - $post_data, | |
| 261 | - 'decode' | |
| 262 | - ); | |
| 234 | + case 'perform_fix_pf_items-step3': | |
| 235 | + // Check KEY | |
| 236 | +        if (!hash_equals((string) $session->get('key'), (string) $post_key)) { | |
| 237 | + echo prepareExchangedData( | |
| 238 | + array( | |
| 239 | + 'error' => true, | |
| 240 | +                    'message' => $lang->get('key_is_not_correct'), | |
| 241 | + ), | |
| 242 | + 'encode' | |
| 243 | + ); | |
| 244 | + break; | |
| 245 | + } | |
| 246 | + // Is admin? | |
| 247 | +        if ((int) $session->get('user-admin') !== 1) { | |
| 248 | + echo prepareExchangedData( | |
| 249 | + array( | |
| 250 | + 'error' => true, | |
| 251 | +                    'message' => $lang->get('error_not_allowed_to'), | |
| 252 | + ), | |
| 253 | + 'encode' | |
| 254 | + ); | |
| 255 | + break; | |
| 256 | + } | |
| 257 | + | |
| 258 | + // decrypt and retrieve data in JSON format | |
| 259 | + $dataReceived = prepareExchangedData( | |
| 260 | + $post_data, | |
| 261 | + 'decode' | |
| 262 | + ); | |
| 263 | 263 | |
| 264 | - $userId = filter_var($dataReceived['userId'], FILTER_SANITIZE_NUMBER_INT); | |
| 265 | - $personalFolders = filter_var($dataReceived['personalFolders'], FILTER_SANITIZE_FULL_SPECIAL_CHARS); | |
| 264 | + $userId = filter_var($dataReceived['userId'], FILTER_SANITIZE_NUMBER_INT); | |
| 265 | + $personalFolders = filter_var($dataReceived['personalFolders'], FILTER_SANITIZE_FULL_SPECIAL_CHARS); | |
| 266 | 266 | |
| 267 | - // Update from items_old to items all the private itemsitems that have been converted to teampass_aes | |
| 268 | - // Get all key back | |
| 269 | - $items = DB::query( | |
| 270 | - "SELECT id | |
| 267 | + // Update from items_old to items all the private itemsitems that have been converted to teampass_aes | |
| 268 | + // Get all key back | |
| 269 | + $items = DB::query( | |
| 270 | + "SELECT id | |
| 271 | 271 | FROM teampass_items | 
| 272 | 272 | WHERE id_tree IN %ls AND encryption_type = %s", | 
| 273 | - $personalFolders, | |
| 274 | - "teampass_aes" | |
| 275 | - ); | |
| 276 | - //DB::debugMode(false); | |
| 277 | - $nbItems = DB::count(); | |
| 278 | -    foreach ($items as $item) { | |
| 279 | -        $defusePwd = DB::queryFirstField("SELECT pw FROM teampass_items_old WHERE id = %i", $item['id']); | |
| 280 | - DB::update( | |
| 281 | - "teampass_items", | |
| 282 | - ['pw' => $defusePwd, "encryption_type" => "defuse"], | |
| 283 | - "id = %i", | |
| 284 | - $item['id'] | |
| 273 | + $personalFolders, | |
| 274 | + "teampass_aes" | |
| 285 | 275 | ); | 
| 286 | - } | |
| 276 | + //DB::debugMode(false); | |
| 277 | + $nbItems = DB::count(); | |
| 278 | +        foreach ($items as $item) { | |
| 279 | +            $defusePwd = DB::queryFirstField("SELECT pw FROM teampass_items_old WHERE id = %i", $item['id']); | |
| 280 | + DB::update( | |
| 281 | + "teampass_items", | |
| 282 | + ['pw' => $defusePwd, "encryption_type" => "defuse"], | |
| 283 | + "id = %i", | |
| 284 | + $item['id'] | |
| 285 | + ); | |
| 286 | + } | |
| 287 | 287 | |
| 288 | 288 | |
| 289 | - //Show done | |
| 290 | - echo prepareExchangedData( | |
| 291 | - array( | |
| 292 | - 'error' => false, | |
| 293 | - 'message' => '<br>Number of items reseted to Defuse: ', | |
| 294 | - 'nbItems' => $nbItems, | |
| 295 | - 'personalFolders' => json_encode($personalFolders), | |
| 296 | - ), | |
| 297 | - 'encode' | |
| 298 | - ); | |
| 299 | - break; | |
| 300 | - | |
| 301 | - /* TOOL #2 - Fixing items master keys */ | |
| 302 | - /* | |
| 289 | + //Show done | |
| 290 | + echo prepareExchangedData( | |
| 291 | + array( | |
| 292 | + 'error' => false, | |
| 293 | + 'message' => '<br>Number of items reseted to Defuse: ', | |
| 294 | + 'nbItems' => $nbItems, | |
| 295 | + 'personalFolders' => json_encode($personalFolders), | |
| 296 | + ), | |
| 297 | + 'encode' | |
| 298 | + ); | |
| 299 | + break; | |
| 300 | + | |
| 301 | + /* TOOL #2 - Fixing items master keys */ | |
| 302 | + /* | |
| 303 | 303 | * STEP 1 - Check if we have the correct pwd for TP_USER | 
| 304 | 304 | */ | 
| 305 | 305 | case 'perform_fix_items_master_keys-step1': |