--- loncom/lond	2017/03/20 13:53:22	1.535
+++ loncom/lond	2017/05/09 03:04:21	1.536
@@ -2,7 +2,7 @@
 # The LearningOnline Network
 # lond "LON Daemon" Server (port "LOND" 5663)
 #
-# $Id: lond,v 1.535 2017/03/20 13:53:22 raeburn Exp $
+# $Id: lond,v 1.536 2017/05/09 03:04:21 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -65,7 +65,7 @@ my $DEBUG = 0;		       # Non zero to ena
 my $status='';
 my $lastlog='';
 
-my $VERSION='$Revision: 1.535 $'; #' stupid emacs
+my $VERSION='$Revision: 1.536 $'; #' stupid emacs
 my $remoteVERSION;
 my $currenthostid="default";
 my $currentdomainid;
@@ -229,6 +229,7 @@ my %trust = (
                dump => {remote => 1, enroll => 1, domroles => 1},
                edit => {institutiononly => 1},  #not used currently
                eget => {remote => 1, domroles => 1, enroll => 1}, #not used currently
+               egetdom => {remote => 1, domroles => 1, enroll => 1, },
                ekey => {}, #not used currently
                exit => {anywhere => 1},
                fetchuserfile => {remote => 1, enroll => 1},
@@ -3393,7 +3394,8 @@ sub get_profile_entry {
 #
 #  Parameters:
 #     $cmd               - Command keyword of request (eget).
-#     $tail              - Tail of the command.  See GetProfileEntry
#                          for more information about this.
+#     $tail              - Tail of the command.  See GetProfileEntry
+#                          for more information about this.
 #     $client            - File open on the client.
 #  Returns:
 #     1      - Continue processing
@@ -4876,7 +4878,41 @@ sub get_domain_handler {
     my ($cmd, $tail, $client) = @_;
 
 
-    my $userinput = "$client:$tail";
+    my $userinput = "$cmd:$tail";
+
+    my ($udom,$namespace,$what)=split(/:/,$tail,3);
+    chomp($what);
+    if ($namespace =~ /^enc/) {
+        &Failure( $client, "refused\n", $userinput);
+    } else {
+        my @queries=split(/\&/,$what);
+        my $qresult='';
+        my $hashref = &tie_domain_hash($udom, "$namespace", &GDBM_READER());
+        if ($hashref) {
+            for (my $i=0;$i<=$#queries;$i++) {
+                $qresult.="$hashref->{$queries[$i]}&";
+            }
+            if (&untie_domain_hash($hashref)) {
+                $qresult=~s/\&$//;
+                &Reply($client, \$qresult, $userinput);
+            } else {
+                &Failure( $client, "error: ".($!+0)." untie(GDBM) Failed ".
+                          "while attempting getdom\n",$userinput);
+            }
+        } else {
+            &Failure($client, "error: ".($!+0)." tie(GDBM) Failed ".
+                     "while attempting getdom\n",$userinput);
+        }
+    }
+
+    return 1;
+}
+&register_handler("getdom", \&get_domain_handler, 0, 1, 0);
+
+sub encrypted_get_domain_handler {
+    my ($cmd, $tail, $client) = @_;
+
+    my $userinput = "$cmd:$tail";
 
     my ($udom,$namespace,$what)=split(/:/,$tail,3);
     chomp($what);
@@ -4889,19 +4925,31 @@ sub get_domain_handler {
         }
         if (&untie_domain_hash($hashref)) {
             $qresult=~s/\&$//;
-            &Reply($client, \$qresult, $userinput);
+            if ($cipher) {
+                my $cmdlength=length($qresult);
+                $qresult.="         ";
+                my $encqresult='';
+                for (my $encidx=0;$encidx<=$cmdlength;$encidx+=8) {
+                    $encqresult.= unpack("H16",
+                                         $cipher->encrypt(substr($qresult,
+                                                                 $encidx,
+                                                                 8)));
+                }
+                &Reply( $client, "enc:$cmdlength:$encqresult\n", $userinput);
+            } else {
+                &Failure( $client, "error:no_key\n", $userinput);
+            }
         } else {
             &Failure( $client, "error: ".($!+0)." untie(GDBM) Failed ".
-                      "while attempting getdom\n",$userinput);
+                      "while attempting egetdom\n",$userinput);
         }
     } else {
         &Failure($client, "error: ".($!+0)." tie(GDBM) Failed ".
-                 "while attempting getdom\n",$userinput);
+                 "while attempting egetdom\n",$userinput);
     }
-
     return 1;
 }
-&register_handler("getdom", \&get_domain_handler, 0, 1, 0);
+&register_handler("egetdom", \&encrypted_get_domain_handler, 1, 1, 0);
 
 #
 #  Puts an id to a domains id database. 
@@ -5801,7 +5849,7 @@ sub auto_export_grades_handler {
     return 1;
 }
 &register_handler("autoexportgrades", \&auto_export_grades_handler,
-                  0, 1, 0);
+                  1, 1, 0);
 
 #   Retrieve and remove temporary files created by/during autoenrollment.
 #