Skip to content

Commit

Permalink
force xml response from jss, just in case your jss likes to return js…
Browse files Browse the repository at this point in the history 
…on by default. https://jamfnation.jamfsoftware.com/discussion.html?id=13544
  • Loading branch information
@loceee
loceee committed Mar 3, 2015
1 parent 5c262c5 commit b882766
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 18 deletions.
30 changes: 15 additions & 15 deletions 0patchoo.sh
View file
Expand Up @@ -398,7 +398,7 @@ cachePkg()
pkgext=${pkgname##*.} # handle zipped bundle pkgs
[ "$pkgext" == "zip" ] && pkgnamelesszip=$(echo "$pkgname" | sed 's/\(.*\)\..*/\1/')
# get pkgdata from the jss api
curl $curlopts -H "Content-Type: application/xml" -s -u "$apiuser:$apipass" "${jssurl}JSSResource/packages/name/$pkgname" -X GET > "$pkgdatafolder/$pkgname.caspinfo.xml"
curl $curlopts -H "Accept: application/xml" -s -u "$apiuser:$apipass" "${jssurl}JSSResource/packages/name/$pkgname" -X GET > "$pkgdatafolder/$pkgname.caspinfo.xml"
# (error checking)
pkgdescription=$(cat "$pkgdatafolder/$pkgname.caspinfo.xml" | xpath //package/info 2> /dev/null | sed 's/<info>//;s/<\/info>//')
if [ "$pkgdescription" == "<info />" ] || [ "$pkgdescription" == "" ] # if it's no pkginfo in jss, set pkgdescription to pkgname (less ext)
Expand Down Expand Up @@ -428,7 +428,7 @@ cachePkg()
# query the JSS for the prereqpolicy
secho "$prereqreceipt is required and NOT found"
secho "querying jss for policy $prereqpolicy to install $prereqreceipt"
prereqpolicyid=$(curl $curlopts -H "Content-Type: application/xml" -s -u "$apiuser:$apipass" "${jssurl}JSSResource/policies/name/$prereqpolicy" -X GET | xpath //policy/general/id 2> /dev/null | sed -e 's/<id>//;s/<\/id>//')
prereqpolicyid=$(curl $curlopts -H "Accept: application/xml" -s -u "$apiuser:$apipass" "${jssurl}JSSResource/policies/name/$prereqpolicy" -X GET | xpath //policy/general/id 2> /dev/null | sed -e 's/<id>//;s/<\/id>//')
# (error checking)
# let's run the preq policy via id
# this is how we chain incremental updates
Expand Down Expand Up @@ -1189,7 +1189,7 @@ getGroupMembership()
if [ ! -f "$jssgroupfile" ]
then
secho "getting computer group membership ..."
curl $curlopts -H "Content-Type: application/xml" -s -u "$apiuser:$apipass" "${jssurl}JSSResource/computers/macaddress/$macaddress" | xpath //computer/groups_accounts/computer_group_memberships[1] 2> /dev/null | sed -e 's/<computer_group_memberships>//g;s/<\/computer_group_memberships>//g;s/<group>//g;s/<\/group>/\n/g' > "$jssgroupfile"
curl $curlopts -H "Accept: application/xml" -s -u "$apiuser:$apipass" "${jssurl}JSSResource/computers/macaddress/$macaddress" | xpath //computer/groups_accounts/computer_group_memberships[1] 2> /dev/null | sed -e 's/<computer_group_memberships>//g;s/<\/computer_group_memberships>//g;s/<group>//g;s/<\/group>/\n/g' > "$jssgroupfile"
fi
for checkgroup in ${jssgroup[@]}
do
Expand Down Expand Up @@ -1327,23 +1327,23 @@ checkAndReadProvisionInfo()
pdprovisioninfo=true
if $pdusebuildea
then
patchoobuild=$(curl $curlopts -H "Content-Type: application/xml" -s -u "$apiuser:$apipass" "${jssurl}JSSResource/computers/macaddress/$macaddress/subset/extension_attributes" | xpath "//*[name='$pdbuildea']/value/text()" 2> /dev/null)
patchoobuild=$(curl $curlopts -H "Accept: application/xml" -s -u "$apiuser:$apipass" "${jssurl}JSSResource/computers/macaddress/$macaddress/subset/extension_attributes" | xpath "//*[name='$pdbuildea']/value/text()" 2> /dev/null)
# error checking
echo "patchoobuild: $patchoobuild" >> "$pdprovisiontmp"
[ "$patchoobuild" == "" ] && pdprovisioninfo=false
fi

if $pdusedepts
then
department=$(curl $curlopts -H "Content-Type: application/xml" -s -u "$apiuser:$apipass" "${jssurl}JSSResource/computers/macaddress/$macaddress/subset/location" | xpath "//computer/location/department/text()" 2> /dev/null)
department=$(curl $curlopts -H "Accept: application/xml" -s -u "$apiuser:$apipass" "${jssurl}JSSResource/computers/macaddress/$macaddress/subset/location" | xpath "//computer/location/department/text()" 2> /dev/null)
# error checking
echo "department: $department" >> "$pdprovisiontmp"
[ "$department" == "" ] && pdprovisioninfo=false
fi

if $pdusebuildings
then
building=$(curl $curlopts -H "Content-Type: application/xml" -s -u "$apiuser:$apipass" "${jssurl}JSSResource/computers/macaddress/$macaddress/subset/location" | xpath "//computer/location/building/text()" 2> /dev/null)
building=$(curl $curlopts -H "Accept: application/xml" -s -u "$apiuser:$apipass" "${jssurl}JSSResource/computers/macaddress/$macaddress/subset/location" | xpath "//computer/location/building/text()" 2> /dev/null)
# error checkingx
echo "building: $building" >> "$pdprovisiontmp"
[ "$building" == "" ] && pdprovisioninfo=false
Expand Down Expand Up @@ -1374,7 +1374,7 @@ EOF
promptAndSetComputerName()
{
# this computer must existing in the JSS... as we've been enrolled!
computername=$(curl $curlopts -H "Content-Type: application/xml" -s -u "$apiuser:$apipass" "${jssurl}JSSResource/computers/macaddress/$macaddress/subset/general" | xpath "//computer/general/name/text()" 2> /dev/null)
computername=$(curl $curlopts -H "Accept: application/xml" -s -u "$apiuser:$apipass" "${jssurl}JSSResource/computers/macaddress/$macaddress/subset/general" | xpath "//computer/general/name/text()" 2> /dev/null)
if $pdsetcomputername
then
secho "current computername is $computername"
Expand All @@ -1388,7 +1388,7 @@ promptAndSetComputerName()
continue
else
# lookup jss to ensure computername isn't in use
macaddresslookup=$(curl $curlopts -H "Content-Type: application/xml" -s -u "$apiuser:$apipass" "${jssurl}JSSResource/computers/name/$(echo "$newcomputername" | sed -e 's/ /\+/g')/subset/general" | xpath "//computer/general/mac_address/text()" 2> /dev/null | sed 's/:/./g' | tr '[:upper:]' '[:lower:]')
macaddresslookup=$(curl $curlopts -H "Accept: application/xml" -s -u "$apiuser:$apipass" "${jssurl}JSSResource/computers/name/$(echo "$newcomputername" | sed -e 's/ /\+/g')/subset/general" | xpath "//computer/general/mac_address/text()" 2> /dev/null | sed 's/:/./g' | tr '[:upper:]' '[:lower:]')
if [ "$macaddresslookup" == "" ] || [ "$macaddresslookup" == "$macaddress" ] # no entry, or our entry - ok to go
then
computername="$newcomputername"
Expand Down Expand Up @@ -1442,7 +1442,7 @@ Would you like to change?\" buttons {\"Change...\",\"Continue Deployment\"} def
if $pdusebuildea
then
#read patchoobuilds
patchoobuildchoicearray=($(curl $curlopts -H "Content-Type: application/xml" -s -u "$apiuser:$apipass" "${jssurl}JSSResource/computerextensionattributes/name/$(echo "$pdbuildea" | sed -e 's/ /\+/g')" | xpath //computer_extension_attribute/*/popup_choices/* 2> /dev/null | sed -e 's/<choice>//g' | sed -e $'s/<\/choice>/\\\n/g'))
patchoobuildchoicearray=($(curl $curlopts -H "Accept: application/xml" -s -u "$apiuser:$apipass" "${jssurl}JSSResource/computerextensionattributes/name/$(echo "$pdbuildea" | sed -e 's/ /\+/g')" | xpath //computer_extension_attribute/*/popup_choices/* 2> /dev/null | sed -e 's/<choice>//g' | sed -e $'s/<\/choice>/\\\n/g'))
# error checking
for line in "${patchoobuildchoicearray[@]}"
do
Expand All @@ -1454,7 +1454,7 @@ Would you like to change?\" buttons {\"Change...\",\"Continue Deployment\"} def
if $pdusedepts
then
#read dept choices
deptchoicearray=($(curl $curlopts -H "Content-Type: application/xml" -s -u "$apiuser:$apipass" "${jssurl}JSSResource/departments" | xpath //departments/department/name 2> /dev/null | sed -e 's/<name>//g' | sed -e $'s/<\/name>/\\\n/g'))
deptchoicearray=($(curl $curlopts -H "Accept: application/xml" -s -u "$apiuser:$apipass" "${jssurl}JSSResource/departments" | xpath //departments/department/name 2> /dev/null | sed -e 's/<name>//g' | sed -e $'s/<\/name>/\\\n/g'))
# error checking
for line in "${deptchoicearray[@]}"
do
Expand All @@ -1466,7 +1466,7 @@ Would you like to change?\" buttons {\"Change...\",\"Continue Deployment\"} def
if $pdusebuildings
then
#read building choices
buildingchoicearray=($(curl $curlopts -H "Content-Type: application/xml" -s -u "$apiuser:$apipass" "${jssurl}JSSResource/buildings" | xpath //buildings/building/name 2> /dev/null | sed -e 's/<name>//g' | sed -e $'s/<\/name>/\\\n/g'))
buildingchoicearray=($(curl $curlopts -H "Accept: application/xml" -s -u "$apiuser:$apipass" "${jssurl}JSSResource/buildings" | xpath //buildings/building/name 2> /dev/null | sed -e 's/<name>//g' | sed -e $'s/<\/name>/\\\n/g'))
for line in "${buildingchoicearray[@]}"
do
echo "$line" >> "$choicetmp"
Expand Down Expand Up @@ -1522,19 +1522,19 @@ Would you like to change?\" buttons {\"Change...\",\"Continue Deployment\"} def

if $pdusebuildea
then
putresult=$(curl $curlopts -H "Content-Type: application/xml" -s -u "$tmpapiadminuser:$tmpapiadminpass" "${jssurl}JSSResource/computers/macaddress/$macaddress/subset/extensionattributes" -T "$patchoobuildeatmp" -X PUT | grep "requires user authentication")
putresult=$(curl $curlopts -H "Accept: application/xml" -s -u "$tmpapiadminuser:$tmpapiadminpass" "${jssurl}JSSResource/computers/macaddress/$macaddress/subset/extensionattributes" -T "$patchoobuildeatmp" -X PUT | grep "requires user authentication")
[ "$putresult" != "" ] && retryauth=true
fi

if $pdusedepts
then
putresult=$(curl $curlopts -H "Content-Type: application/xml" -s -u "$tmpapiadminuser:$tmpapiadminpass" "${jssurl}JSSResource/computers/macaddress/$macaddress/subset/location" -T "$depttmp" -X PUT | grep "requires user authentication")
putresult=$(curl $curlopts -H "Accept: application/xml" -s -u "$tmpapiadminuser:$tmpapiadminpass" "${jssurl}JSSResource/computers/macaddress/$macaddress/subset/location" -T "$depttmp" -X PUT | grep "requires user authentication")
[ "$putresult" != "" ] && retryauth=true
fi

if $pdusebuildings
then
putresult=$(curl $curlopts -H "Content-Type: application/xml" -s -u "$tmpapiadminuser:$tmpapiadminpass" "${jssurl}JSSResource/computers/macaddress/$macaddress/subset/location" -T "$buildingtmp" -X PUT | grep "requires user authentication")
putresult=$(curl $curlopts -H "Accept: application/xml" -s -u "$tmpapiadminuser:$tmpapiadminpass" "${jssurl}JSSResource/computers/macaddress/$macaddress/subset/location" -T "$buildingtmp" -X PUT | grep "requires user authentication")
[ "$putresult" != "" ] && retryauth=true
fi

Expand Down Expand Up @@ -1642,7 +1642,7 @@ deployGroup()
if [ "$triggerorpolicy" != "" ]
then
secho "looking up $triggerorpolicy against jss..."
policyid=$(curl $curlopts -H "Content-Type: application/xml" -s -u "$apiuser:$apipass" "${jssurl}JSSResource/policies/name/$(echo "$triggerorpolicy" | sed -e 's/ /\+/g')" -X GET | xpath //policy/general/id 2> /dev/null | sed -e 's/<id>//;s/<\/id>//')
policyid=$(curl $curlopts -H "Accept: application/xml" -s -u "$apiuser:$apipass" "${jssurl}JSSResource/policies/name/$(echo "$triggerorpolicy" | sed -e 's/ /\+/g')" -X GET | xpath //policy/general/id 2> /dev/null | sed -e 's/<id>//;s/<\/id>//')
if [ "$policyid" != "" ]
then
secho "jamf calling policy id $policyid"
Expand Down
6 changes: 3 additions & 3 deletions extras/asucatalogset.sh
View file
Expand Up @@ -61,7 +61,7 @@ myipint=$(ipToInt ${myip})

echo "my ip: ${myip}"

curl ${curlopts} -H "Content-Type: application/xml" -s -u "${apiuser}:${apipass}" ${jssurl}JSSResource/networksegments > "${tmpnetsegout}"
curl ${curlopts} -H "Accept: application/xml" -s -u "${apiuser}:${apipass}" ${jssurl}JSSResource/networksegments > "${tmpnetsegout}"

# get number of segments
netsegsize=$(xpath $tmpnetsegout "//network_segments/size/text()" 2> /dev/null)
Expand Down Expand Up @@ -94,9 +94,9 @@ if $foundseg
then
echo "getting swupdate server..."
mynetidx=$i
curl ${curlopts} -H "Content-Type: application/xml" -s -u "${apiuser}:${apipass}" ${jssurl}JSSResource/networksegments/id/${netsegid[$mynetidx]} > "${tmpdir}/mynetseg.xml"
curl ${curlopts} -H "Accept: application/xml" -s -u "${apiuser}:${apipass}" ${jssurl}JSSResource/networksegments/id/${netsegid[$mynetidx]} > "${tmpdir}/mynetseg.xml"
asuservername=$(xpath "${tmpdir}/mynetseg.xml" "//network_segment/swu_server/text()" 2> /dev/null)
curl ${curlopts} -H "Content-Type: application/xml" -s -u "${apiuser}:${apipass}" ${jssurl}JSSResource/softwareupdateservers/name/$(echo ${asuservername} | sed -e 's/ /\+/g') > "${tmpdir}/asuserver.xml"
curl ${curlopts} -H "Accept: application/xml" -s -u "${apiuser}:${apipass}" ${jssurl}JSSResource/softwareupdateservers/name/$(echo ${asuservername} | sed -e 's/ /\+/g') > "${tmpdir}/asuserver.xml"
asuserver=$(xpath "${tmpdir}/asuserver.xml" "//software_update_server/ip_address/text()" 2> /dev/null)
asuport=$(xpath "${tmpdir}/asuserver.xml" "//software_update_server/port/text()" 2> /dev/null)

Expand Down

0 comments on commit b882766

Please sign in to comment.