소스 검색

Restore monkeysphere identifier

Bob Mottram 9 년 전
부모
커밋
d8d95b40aa
3개의 변경된 파일1076개의 추가작업 그리고 1030개의 파일을 삭제
  1. 5
    1
      src/freedombone
  2. 1050
    1029
      src/freedombone-restore-local
  3. 21
    0
      src/freedombone-restore-remote

+ 5
- 1
src/freedombone 파일 보기

5376
     chmod 644 /home/$MY_USERNAME/.monkeysphere/authorized_user_ids
5376
     chmod 644 /home/$MY_USERNAME/.monkeysphere/authorized_user_ids
5377
     chown -R $MY_USERNAME:$MY_USERNAME /home/$MY_USERNAME/.monkeysphere
5377
     chown -R $MY_USERNAME:$MY_USERNAME /home/$MY_USERNAME/.monkeysphere
5378
     monkeysphere-authentication update-users
5378
     monkeysphere-authentication update-users
5379
-	
5379
+
5380
+    # The admin user is the identity certifier
5381
+	fpr=$(gpg --with-colons --fingerprint $MY_GPG_PUBLIC_KEY_ID | grep fpr | head -n 1 | awk -F ':' '{print $10}')	
5382
+    monkeysphere-authentication add-identity-certifier $fpr
5383
+
5380
     echo 'install_monkeysphere' >> $COMPLETION_FILE
5384
     echo 'install_monkeysphere' >> $COMPLETION_FILE
5381
 }
5385
 }
5382
 
5386
 

+ 1050
- 1029
src/freedombone-restore-local
파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
파일 보기


+ 21
- 0
src/freedombone-restore-remote 파일 보기

488
 	done
488
 	done
489
 }
489
 }
490
 
490
 
491
+function gpg_pubkey_from_email {
492
+	key_owner_username=$1
493
+	key_email_address=$2
494
+	key_id=
495
+	if [[ $key_owner_username != "root" ]]; then
496
+		key_id=$(su -c "gpg --list-keys $key_email_address | grep 'pub '" - $key_owner_username | awk -F ' ' '{print $2}' | awk -F '/' '{print $2}')
497
+	else
498
+		key_id=$(gpg --list-keys $key_email_address | grep 'pub ' | awk -F ' ' '{print $2}' | awk -F '/' '{print $2}')
499
+	fi
500
+	echo $key_id
501
+}
502
+
491
 function restore_user_monkeysphere {
503
 function restore_user_monkeysphere {
492
 	if [[ $RESTORE_APP != 'all' ]]; then
504
 	if [[ $RESTORE_APP != 'all' ]]; then
493
 		if [[ $RESTORE_APP != 'usermonkeysphere' ]]; then
505
 		if [[ $RESTORE_APP != 'usermonkeysphere' ]]; then
511
 				rm -rf /root/tempmonkeysphere
523
 				rm -rf /root/tempmonkeysphere
512
 			fi
524
 			fi
513
 		fi
525
 		fi
526
+
527
+		# The admin user is the identity certifier
528
+		MY_EMAIL_ADDRESS="${ADMIN_USERNAME}@${HOSTNAME}"
529
+		if grep -q "MY_EMAIL_ADDRESS" $CONFIG_FILE; then
530
+			MY_EMAIL_ADDRESS=$(grep "MY_EMAIL_ADDRESS" $CONFIG_FILE | awk -F '=' '{print $2}')
531
+		fi
532
+		MY_GPG_PUBLIC_KEY_ID=$(gpg_pubkey_from_email "$ADMIN_USERNAME" "$MY_EMAIL_ADDRESS")
533
+		fpr=$(gpg --with-colons --fingerprint $MY_GPG_PUBLIC_KEY_ID | grep fpr | head -n 1 | awk -F ':' '{print $10}')
534
+		monkeysphere-authentication add-identity-certifier $fpr
514
 		monkeysphere-authentication update-users
535
 		monkeysphere-authentication update-users
515
 	done
536
 	done
516
 }
537
 }