--- loncom/lonnet/perl/lonnet.pm 2000/07/18 13:46:49 1.19
+++ loncom/lonnet/perl/lonnet.pm 2000/08/14 21:40:46 1.23
@@ -4,7 +4,18 @@
# Functions for use by content handlers:
#
# plaintext(short) : plain text explanation of short term
-# allowed(short,url) : returns codes for allowed actions
+# allowed(short,url) : returns codes for allowed actions F,R,S,C
+# definerole(rolename,sys,dom,cou) : define a custom role rolename
+# set priviledges in format of lonTabs/roles.tab for
+# system, domain and course level,
+# assignrole(udom,uname,url,role,end,start) : give a role to a user for the
+# level given by url. Optional start and end dates
+# (leave empty string or zero for "no date")
+# assigncustomrole (udom,uname,url,rdom,rnam,rolename,end,start) : give a
+# custom role to a user for the level given by url.
+# Specify name and domain of role author, and role name
+# revokerole (udom,uname,url,role) : Revoke a role for url
+# revokecustomrole (udom,uname,url,rdom,rnam,rolename) : Revoke a custom role
# appendenv(hash) : adds hash to session environment
# store(hash) : stores hash permanently for this url
# restore : returns hash for this url
@@ -12,7 +23,8 @@
# get(namesp,array) : returns hash with keys from array filled in from namesp
# put(namesp,hash) : stores hash in namesp
# dump(namesp) : dumps the complete namespace into a hash
-# ssi(url) : does a complete request cycle on url to localhost
+# ssi(url,hash) : does a complete request cycle on url to localhost, posts
+# hash
# repcopy(filename) : replicate file
# dirlist(url) : gets a directory listing
#
@@ -24,7 +36,8 @@
# 04/05,05/29,05/31,06/01,
# 06/05,06/26 Gerd Kortemeyer
# 06/26 Ben Tyszka
-# 06/30,07/15,07/17,07/18 Gerd Kortemeyer
+# 06/30,07/15,07/17,07/18,07/20,07/21,07/22,07/25 Gerd Kortemeyer
+# 08/14 Ben Tyszka
package Apache::lonnet;
@@ -292,6 +305,7 @@ sub subscribe {
sub repcopy {
my $filename=shift;
+ $filename=~s/\/+/\//g;
my $transname="$filename.in.transfer";
if ((-e $filename) || (-e $transname)) { return OK; }
my $remoteurl=subscribe($filename);
@@ -301,9 +315,11 @@ sub repcopy {
} elsif ($remoteurl eq 'not_found') {
&logthis("Subscribe returned not_found: $filename");
return HTTP_NOT_FOUND;
- } elsif ($remoteurl eq 'forbidden') {
- &logthis("Subscribe returned forbidden: $filename");
+ } elsif ($remoteurl eq 'rejected') {
+ &logthis("Subscribe returned rejected: $filename");
return FORBIDDEN;
+ } elsif ($remoteurl eq 'directory') {
+ return OK;
} else {
my @parts=split(/\//,$filename);
my $path="/$parts[1]/$parts[2]/$parts[3]/$parts[4]";
@@ -347,10 +363,19 @@ sub repcopy {
sub ssi {
- my $fn=shift;
+ my ($fn,%form)=@_;
my $ua=new LWP::UserAgent;
- my $request=new HTTP::Request('GET',"http://".$ENV{'HTTP_HOST'}.$fn);
+
+ my $request;
+
+ if (%form) {
+ $request=new HTTP::Request('POST',"http://".$ENV{'HTTP_HOST'}.$fn);
+ $request->content(join '&', map { "$_=$form{$_}" } keys %form);
+ } else {
+ $request=new HTTP::Request('GET',"http://".$ENV{'HTTP_HOST'}.$fn);
+ }
+
$request->header(Cookie => $ENV{'HTTP_COOKIE'});
my $response=$ua->request($request);
@@ -400,15 +425,18 @@ sub rolesinit {
if (($rolesdump eq 'con_lost') || ($rolesdump eq '')) { return ''; }
my %allroles=();
my %thesepriv=();
- my $userroles='';
my $now=time;
+ my $userroles="user.login.time=$now\n";
my $thesestr;
if ($rolesdump ne '') {
map {
- if ($_!~/rolesdef\&/) {
+ if ($_!~/^rolesdef\&/) {
my ($area,$role)=split(/=/,$_);
+ $area=~s/\_\w\w$//;
my ($trole,$tend,$tstart)=split(/_/,$role);
+ $userroles.='user.role.'.$trole.'.'.$area.'='.
+ $tstart.'.'.$tend."\n";
if ($tend!=0) {
if ($tend<$now) {
$trole='';
@@ -420,19 +448,17 @@ sub rolesinit {
}
}
if (($area ne '') && ($trole ne '')) {
- $userroles.='user.role.'.$trole.'.'.$area.'='.
- $tstart.'.'.$tend."\n";
my ($tdummy,$tdomain,$trest)=split(/\//,$area);
if ($trole =~ /^cr\//) {
my ($rdummy,$rdomain,$rauthor,$rrole)=split(/\//,$trole);
my $homsvr=homeserver($rauthor,$rdomain);
if ($hostname{$homsvr} ne '') {
my $roledef=
- reply("get:$rdomain:$rauthor:roles:rolesdef&$rrole",
+ reply("get:$rdomain:$rauthor:roles:rolesdef_$rrole",
$homsvr);
if (($roledef ne 'con_lost') && ($roledef ne '')) {
my ($syspriv,$dompriv,$coursepriv)=
- split(/&&/,$roledef);
+ split(/\_/,unescape($roledef));
$allroles{'/'}.=':'.$syspriv;
if ($tdomain ne '') {
$allroles{'/'.$tdomain.'/'}.=':'.$dompriv;
@@ -571,9 +597,37 @@ sub allowed {
sub definerole {
if (allowed('mcr','/')) {
my ($rolename,$sysrole,$domrole,$courole)=@_;
+ map {
+ my ($crole,$cqual)=split(/\&/,$_);
+ if ($pr{'cr:s'}!~/$crole/) { return "refused:s:$crole"; }
+ if ($pr{'cr:s'}=~/$crole\&/) {
+ if ($pr{'cr:s'}!~/$crole\&\w*$cqual/) {
+ return "refused:s:$crole&$cqual";
+ }
+ }
+ } split('/',$sysrole);
+ map {
+ my ($crole,$cqual)=split(/\&/,$_);
+ if ($pr{'cr:d'}!~/$crole/) { return "refused:d:$crole"; }
+ if ($pr{'cr:d'}=~/$crole\&/) {
+ if ($pr{'cr:d'}!~/$crole\&\w*$cqual/) {
+ return "refused:d:$crole&$cqual";
+ }
+ }
+ } split('/',$domrole);
+ map {
+ my ($crole,$cqual)=split(/\&/,$_);
+ if ($pr{'cr:c'}!~/$crole/) { return "refused:c:$crole"; }
+ if ($pr{'cr:c'}=~/$crole\&/) {
+ if ($pr{'cr:c'}!~/$crole\&\w*$cqual/) {
+ return "refused:c:$crole&$cqual";
+ }
+ }
+ } split('/',$courole);
my $command="encrypt:rolesput:$ENV{'user.domain'}:$ENV{'user.name'}:".
"$ENV{'user.domain'}:$ENV{'user.name'}:".
- "rolesdef&$rolename=$sysrole&&$domrole&&$courole";
+ "rolesdef_$rolename=".
+ escape($sysrole.'_'.$domrole.'_'.$courole);
return reply($command,$ENV{'user.home'});
} else {
return 'refused';
@@ -583,12 +637,59 @@ sub definerole {
# ------------------------------------------------------------------ Plain Text
sub plaintext {
- return $prp{$_};
+ my $short=shift;
+ return $prp{$short};
}
# ----------------------------------------------------------------- Assign Role
sub assignrole {
+ my ($udom,$uname,$url,$role,$end,$start)=@_;
+ my $mrole;
+ if ($role =~ /^cr\//) {
+ unless ($url=~/\.course$/) { return 'invalid'; }
+ unless (allowed('ccr',$url)) { return 'refused'; }
+ $mrole='cr';
+ } else {
+ unless (($url=~/\.course$/) || ($url=~/\/$/)) { return 'invalid'; }
+ unless (allowed('c'+$role)) { return 'refused'; }
+ $mrole=$role;
+ }
+ my $command="encrypt:rolesput:$ENV{'user.domain'}:$ENV{'user.name'}:".
+ "$udom:$uname:$url".'_'."$mrole=$role";
+ if ($end) { $command.='_$end'; }
+ if ($start) {
+ if ($end) {
+ $command.='_$start';
+ } else {
+ $command.='_0_$start';
+ }
+ }
+ return &reply($command,&homeserver($uname,$udom));
+}
+
+# ---------------------------------------------------------- Assign Custom Role
+
+sub assigncustomrole {
+ my ($udom,$uname,$url,$rdom,$rnam,$rolename,$end,$start)=@_;
+ return &assignrole($udom,$uname,$url,'cr/'.$rdom.'/'.$rnam.'/'.$rolename,
+ $end,$start);
+}
+
+# ----------------------------------------------------------------- Revoke Role
+
+sub revokerole {
+ my ($udom,$uname,$url,$role)=@_;
+ my $now=time;
+ return &assignrole($udom,$uname,$url,$role,$now);
+}
+
+# ---------------------------------------------------------- Revoke Custom Role
+
+sub revokecustomrole {
+ my ($udom,$uname,$url,$rdom,$rnam,$rolename)=@_;
+ my $now=time;
+ return &assigncustomrole($udom,$uname,$url,$rdom,$rnam,$rolename,$now);
}
# ------------------------------------------------------------ Directory lister
@@ -719,12 +820,9 @@ if ($readit ne 'done') {
}
}
+
$readit='done';
&logthis('<font color=yellow>INFO: Read configuration</font>');
}
}
1;
-
-
-
-